---

yaml
---
r: 15427
b: refs/heads/try
c: 1dac883
h: refs/heads/master
i:
  15425: 7142157
  15423: 08de5e2
v: v3

Author: lht

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 0364d60b28cef39bc2f20d2f91ebeabd0fec068b
+refs/heads/try: 1dac88328299ce46cb2f666dda796ff583fb35c1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/test/auxiliary/crateresolve7-1.rs

@@ -1,14 +1,14 @@
 // xfail-fast
-// aux-build:crateresolve7-1.rs
-// aux-build:crateresolve7-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 
 // These both have the same version but differ in other metadata
 mod a {
-    use cr7_1 (name = "crateresolve7", vers = "0.1", calories="100");
-    fn f() -> int { cr7_1::f() }
+    use cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
+    fn f() -> int { cr_1::f() }
 }
 
 mod b {
-    use cr7_2 (name = "crateresolve7", vers = "0.1", calories="200");
-    fn f() -> int { cr7_2::f() }
+    use cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
+    fn f() -> int { cr_2::f() }
 }

branches/try/src/test/auxiliary/crateresolve7-2.rs

@@ -1,4 +1,4 @@
-#[link(name = "crateresolve6",
+#[link(name = "crateresolve_calories",
        vers = "0.1",
        calories = "100")];
 

branches/try/src/test/auxiliary/crateresolve7x.rs

@@ -1,4 +1,4 @@
-#[link(name = "crateresolve6",
+#[link(name = "crateresolve_calories",
        vers = "0.1",
        calories = "200")];
 

branches/try/src/test/auxiliary/crateresolve6-1.rs renamed to branches/try/src/test/auxiliary/crateresolve_calories-1.rs

@@ -1,11 +1,11 @@
 // xfail-fast
-// aux-build:crateresolve6-1.rs
-// aux-build:crateresolve6-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 // error-pattern:mismatched types
 
 // These both have the same version but differ in other metadata
-use cr6_1 (name = "crateresolve6", vers = "0.1", calories="100");
-use cr6_2 (name = "crateresolve6", vers = "0.1", calories="200");
+use cr6_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
+use cr6_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
 
 fn main() {
     assert cr6_1::f() == 100;

branches/try/src/test/auxiliary/crateresolve6-2.rs renamed to branches/try/src/test/auxiliary/crateresolve_calories-2.rs

@@ -1,6 +1,6 @@
 // xfail-fast
-// aux-build:crateresolve7-1.rs
-// aux-build:crateresolve7-2.rs
+// aux-build:crateresolve_calories-1.rs
+// aux-build:crateresolve_calories-2.rs
 // aux-build:crateresolve7x.rs
 
 use crateresolve7x;