Move AST desugaring into expansion phase

This fixes some issues with name resolution 2.0.

gcc/rust/ChangeLog:

	* rust-session-manager.cc (Session::compile_crate): Move
	AST desugaring to...
	(Session::expansion): ...here and add a final TopLevel pass
	afterwards.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove entries.

Signed-off-by: Owen Avery <[email protected]>

Author: powerboat9

gcc/rust/rust-session-manager.cc

@@ -619,10 +619,6 @@ Session::compile_crate (const char *filename)
 
   expansion (parsed_crate, name_resolution_ctx);
 
-  AST::DesugarForLoops ().go (parsed_crate);
-  AST::DesugarQuestionMark ().go (parsed_crate);
-  AST::DesugarApit ().go (parsed_crate);
-
   rust_debug ("\033[0;31mSUCCESSFULLY FINISHED EXPANSION \033[0m");
   if (options.dump_option_enabled (CompileOptions::EXPANSION_DUMP))
     {
@@ -986,6 +982,20 @@ Session::expansion (AST::Crate &crate, Resolver2_0::NameResolutionContext &ctx)
       rust_error_at (range, "reached recursion limit");
     }
 
+  // handle AST desugaring
+  if (!saw_errors ())
+    {
+      AST::DesugarForLoops ().go (crate);
+      AST::DesugarQuestionMark ().go (crate);
+      AST::DesugarApit ().go (crate);
+
+      // HACK: we may need a final TopLevel pass
+      // however, this should not count towards the recursion limit
+      // and we don't need a full Early pass
+      if (flag_name_resolution_2_0)
+	Resolver2_0::TopLevel (ctx).go (crate);
+    }
+
   // error reporting - check unused macros, get missing fragment specifiers
 
   // build test harness

gcc/testsuite/rust/compile/nr2/exclude

@@ -1,8 +1,4 @@
 issue-3315-2.rs
 torture/alt_patterns1.rs
-issue-1487.rs
-issue-2015.rs
-issue-3454.rs
-impl_trait_generic_arg.rs
 issue-3642.rs
 # please don't delete the trailing newline