---

yaml
---
r: 129823
b: refs/heads/auto
c: a40e2a6
h: refs/heads/master
i:
  129821: 5bba71d
  129819: 103e290
  129815: a629cb8
  129807: 7730459
  129791: af0bb3f
v: v3

Author: bkoropoff

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: e0cfe10aad151211fdb6fedaad44334400a37d06
+refs/heads/auto: a40e2a6463f972f687ab7e3636ba8c5595d9877c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::slice as std; //~ ERROR import conflicts with imported crate
+use std::slice as std; //~ ERROR import `std` conflicts with imported crate
 
 fn main() {
 }

branches/auto/src/test/compile-fail/resolve-conflict-item-vs-import.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use std::mem::transmute;
-//~^ ERROR import conflicts with value in this module
+//~^ ERROR import `transmute` conflicts with value in this module
 
 fn transmute() {}