Move queries.crate_name()

bjorn3 · bjorn3 · commit b71cd56e48ef · 2021-05-02T18:12:48.000+02:00
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
@@ -388,10 +388,10 @@ fn run_compiler(
                 return early_exit();
             }
 
-            let crate_name = queries.crate_name()?.peek().clone();
             queries.global_ctxt()?.peek_mut().enter(|tcx| {
-                let result = tcx.analysis(LOCAL_CRATE);
+                tcx.analysis(LOCAL_CRATE)?;
                 if sess.opts.debugging_opts.save_analysis {
+                    let crate_name = queries.crate_name()?.peek().clone();
                     sess.time("save_analysis", || {
                         save::process_crate(
                             tcx,
@@ -405,7 +405,7 @@ fn run_compiler(
                         )
                     });
                 }
-                result
+                Ok(())
             })?;
 
             if callbacks.after_analysis(compiler, queries) == Compilation::Stop {

Original file line number	Diff line number	Diff line change
`@@ -388,10 +388,10 @@ fn run_compiler(`
`388`	`388`	`return early_exit();`
`389`	`389`	`}`
`390`	`390`
`391`		`- let crate_name = queries.crate_name()?.peek().clone();`
`392`	`391`	`queries.global_ctxt()?.peek_mut().enter(\|tcx\| {`
`393`		`- let result = tcx.analysis(LOCAL_CRATE);`
	`392`	`+ tcx.analysis(LOCAL_CRATE)?;`
`394`	`393`	`if sess.opts.debugging_opts.save_analysis {`
	`394`	`+ let crate_name = queries.crate_name()?.peek().clone();`
`395`	`395`	`sess.time("save_analysis", \|\| {`
`396`	`396`	`save::process_crate(`
`397`	`397`	`tcx,`
`@@ -405,7 +405,7 @@ fn run_compiler(`
`405`	`405`	`)`
`406`	`406`	`});`
`407`	`407`	`}`
`408`		`- result`
	`408`	`+ Ok(())`
`409`	`409`	`})?;`
`410`	`410`
`411`	`411`	`if callbacks.after_analysis(compiler, queries) == Compilation::Stop {`