Simplify Cache wrapper to single type, impl Deref on it, fix all compilation errors...

[rust.git] / src / librustdoc / fold.rs

diff --git a/src/librustdoc/fold.rs b/src/librustdoc/fold.rs
index cfa22bc27b7587ed99b94bd1b119240b6ccd385a..5482239c7ce28dd2b1ac3da5be0ba57f341b82f8 100644 (file)
--- a/src/librustdoc/fold.rs
+++ b/src/librustdoc/fold.rs
@@ -105,12 +105,12 @@ fn fold_crate(&mut self, mut c: Crate) -> Crate {
         c.module = c.module.take().and_then(|module| self.fold_item(module));
 
         {
-            let guard = c.external_traits.lock();
-            let traits = guard.replace(Default::default());
-            guard.borrow_mut().extend(traits.into_iter().map(|(k, mut v)| {
+            let mut guard = c.external_traits.borrow_mut();
+            let external_traits = std::mem::replace(&mut *guard, Default::default());
+            *guard = external_traits.into_iter().map(|(k, mut v)| {
                 v.items = v.items.into_iter().filter_map(|i| self.fold_item(i)).collect();
                 (k, v)
-            }));
+            }).collect();
         }
         c
     }