Try to make Queries::finish move out of self

compiler/rustc_interface/src/queries.rs

@@ -332,7 +332,6 @@ impl Compiler {
     where
         F: for<'tcx> FnOnce(&'tcx Queries<'tcx>) -> T,
     {
-        let mut _timer = None;
         let queries = Queries::new(self);
         let ret = f(&queries);
 
@@ -352,11 +351,11 @@ impl Compiler {
                 .time("serialize_dep_graph", || gcx.enter(rustc_incremental::save_dep_graph));
         }
 
-        if let Err((path, error)) = queries.finish() {
-            self.session().emit_err(errors::FailedWritingFile { path: &path, error });
-        }
-
-        _timer = Some(self.session().timer("free_global_ctxt"));
+        self.session().time("free_global_ctxt", || {
+            if let Err((path, error)) = queries.finish() {
+                self.session().emit_err(errors::FailedWritingFile { path: &path, error });
+            }
+        });
 
         ret
     }

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -2252,16 +2252,18 @@ fn encode_metadata_impl(tcx: TyCtxt<'_>, path: &Path) {
     // culminating in the `CrateRoot` which points to all of it.
     let root = ecx.encode_crate_root();
 
+    let file = ecx.opaque.file().try_clone().unwrap();
+    let path = ecx.opaque.path().to_owned();
+
     // Make sure we report any errors from writing to the file.
     // If we forget this, compilation can succeed with an incomplete rmeta file,
     // causing an ICE when the rmeta file is read by another compilation.
     if let Err((path, err)) = ecx.opaque.finish() {
         tcx.sess.emit_err(FailWriteFile { path: &path, err });
     }
 
-    let file = ecx.opaque.file();
-    if let Err(err) = encode_root_position(file, root.position.get()) {
-        tcx.sess.emit_err(FailWriteFile { path: ecx.opaque.path(), err });
+    if let Err(err) = encode_root_position(&file, root.position.get()) {
+        tcx.sess.emit_err(FailWriteFile { path: &path, err });
     }
 
     // Record metadata size for self-profiling

compiler/rustc_middle/src/query/on_disk_cache.rs

@@ -866,7 +866,7 @@ impl<'a, 'tcx> CacheEncoder<'a, 'tcx> {
     }
 
     #[inline]
-    fn finish(mut self) -> FileEncodeResult {
+    fn finish(self) -> FileEncodeResult {
         self.encoder.finish()
     }
 }

compiler/rustc_serialize/src/opaque.rs

@@ -176,7 +176,7 @@ impl FileEncoder {
         })
     }
 
-    pub fn finish(&mut self) -> FileEncodeResult {
+    pub fn finish(mut self) -> FileEncodeResult {
         self.flush();
         #[cfg(debug_assertions)]
         {