about summary refs log tree commit diff
path: root/compiler/rustc_resolve
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <eddyb@lyken.rs>2022-01-26 03:39:14 +0000
committerEduard-Mihai Burtescu <eddyb@lyken.rs>2022-02-23 06:08:06 +0000
commit0b9d70cf6d47df456280f83b58c04c96aa58e89e (patch)
treeade43c09a3ffb7bad3aab2f031dec6ebc4e292a2 /compiler/rustc_resolve
parent8562d6b7523b498f731f78dd740d0bc612983ffc (diff)
downloadrust-0b9d70cf6d47df456280f83b58c04c96aa58e89e.tar.gz
rust-0b9d70cf6d47df456280f83b58c04c96aa58e89e.zip
rustc_errors: take `self` by value in `DiagnosticBuilder::cancel`.
Diffstat (limited to 'compiler/rustc_resolve')
-rw-r--r--compiler/rustc_resolve/src/late.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
index 9ac3e6e22bd..91695257137 100644
--- a/compiler/rustc_resolve/src/late.rs
+++ b/compiler/rustc_resolve/src/late.rs
@@ -2001,13 +2001,11 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
             // into a single one.
             let mut parent_err = this.r.into_struct_error(parent_err.span, parent_err.node);
 
-            parent_err.cancel();
-
             err.message = take(&mut parent_err.message);
             err.code = take(&mut parent_err.code);
             err.children = take(&mut parent_err.children);
 
-            drop(parent_err);
+            parent_err.cancel();
 
             let def_id = this.parent_scope.module.nearest_parent_mod();