about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMarkus Westerlind <markus.westerlind@distilnetworks.com>2020-03-07 20:17:00 +0100
committerMarkus Westerlind <markus.westerlind@distilnetworks.com>2020-03-07 22:35:37 +0100
commit6095fa146ce994c1650376257ab488156e6e745a (patch)
tree30e183afc29d468dab470379c9961a37c3ca089a /src
parentb1b558f1f0cf5caab5c44c88e7050cba71c6be0d (diff)
downloadrust-6095fa146ce994c1650376257ab488156e6e745a.tar.gz
rust-6095fa146ce994c1650376257ab488156e6e745a.zip
refactor: Move a borrow_mut and unwrap out of a loop
Diffstat (limited to 'src')
-rw-r--r--src/librustc_typeck/check/method/mod.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs
index 9b8d88e94b6..542a1ac4536 100644
--- a/src/librustc_typeck/check/method/mod.rs
+++ b/src/librustc_typeck/check/method/mod.rs
@@ -459,12 +459,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             ProbeScope::TraitsInScope,
         )?;
         debug!("resolve_ufcs: pick={:?}", pick);
-        for import_id in pick.import_ids {
-            let import_def_id = tcx.hir().local_def_id(import_id);
-            debug!("resolve_ufcs: used_trait_import: {:?}", import_def_id);
-            Lrc::get_mut(&mut self.tables.borrow_mut().used_trait_imports)
-                .unwrap()
-                .insert(import_def_id);
+        {
+            let mut tables = self.tables.borrow_mut();
+            let used_trait_imports = Lrc::get_mut(&mut tables.used_trait_imports).unwrap();
+            for import_id in pick.import_ids {
+                let import_def_id = tcx.hir().local_def_id(import_id);
+                debug!("resolve_ufcs: used_trait_import: {:?}", import_def_id);
+                used_trait_imports.insert(import_def_id);
+            }
         }
 
         let def_kind = pick.item.def_kind();