formatting
authorEh2406 <YeomanYaacov@gmail.com>
Sat, 24 Feb 2018 21:26:47 +0000 (16:26 -0500)
committerEh2406 <YeomanYaacov@gmail.com>
Sat, 24 Feb 2018 21:26:47 +0000 (16:26 -0500)
src/cargo/core/resolver/mod.rs

index e9ff5de85bbc0f936982d05c30877ecafa539d0f..de1c7b142f4d13ec443bbbd1ab3964d8eaff65e7 100644 (file)
@@ -569,6 +569,7 @@ impl RemainingCandidates {
         // When we are done we return the set of previously activated
         // that conflicted with the ones we tried. If any of these change
         // then we would have considered different candidates.
+        use std::mem::replace;
         for (_, b) in self.remaining.by_ref() {
             if let Some(a) = prev_active
                 .iter()
@@ -579,11 +580,11 @@ impl RemainingCandidates {
                     continue;
                 }
             }
-            if let Some(r) = ::std::mem::replace(&mut self.has_another, Some(b)) {
+            if let Some(r) = replace(&mut self.has_another, Some(b)) {
                 return Ok((r, true));
             }
         }
-        ::std::mem::replace(&mut self.has_another, None)
+        replace(&mut self.has_another, None)
             .map(|r| (r, false))
             .ok_or_else(|| self.conflicting_prev_active.clone())
     }