Fix tests

Author: jyn514

src/bootstrap/builder/tests.rs

@@ -511,7 +511,8 @@ mod dist {
                 target: host,
                 mode: Mode::Std,
                 test_kind: test::TestKind::Test,
-                krate: INTERNER.intern_str("std"),
+                krate_name: INTERNER.intern_str("std"),
+                krate_path: "library/std".into(),
             },]
         );
     }

src/bootstrap/cache.rs

@@ -271,15 +271,15 @@ impl Cache {
 
 #[cfg(test)]
 impl Cache {
-    pub fn all<S: Ord + Copy + Step>(&mut self) -> Vec<(S, S::Output)> {
+    pub fn all<S: Ord + Step>(&mut self) -> Vec<(S, S::Output)> {
         let cache = self.0.get_mut();
         let type_id = TypeId::of::<S>();
         let mut v = cache
             .remove(&type_id)
             .map(|b| b.downcast::<HashMap<S, S::Output>>().expect("correct type"))
             .map(|m| m.into_iter().collect::<Vec<_>>())
             .unwrap_or_default();
-        v.sort_by_key(|&(a, _)| a);
+        v.sort_by_key(|(a, _)| a.clone());
         v
     }
 

src/bootstrap/test.rs

@@ -1824,7 +1824,7 @@ impl Step for CrateLibrustc {
                     target: run.target,
                     test_kind,
                     krate_name: krate.name,
-                    krate_path: krate.path.clone(),
+                    krate_path: krate.local_path(builder.build),
                 });
             }
         }
@@ -1873,7 +1873,7 @@ impl Step for Crate {
                 mode,
                 test_kind,
                 krate_name: krate.name,
-                krate_path: krate.path.clone(),
+                krate_path: krate.local_path(builder.build),
             });
         };