---

yaml
---
r: 129702
b: refs/heads/master
c: a40e2a6
h: refs/heads/master
v: v3

Author: bkoropoff

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e0cfe10aad151211fdb6fedaad44334400a37d06
+refs/heads/master: a40e2a6463f972f687ab7e3636ba8c5595d9877c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 602592675ce86aeca465c4ac748cee2bff291443
 refs/heads/try: 55c1a67fa1eb621bb8e73e0b13af2823391eb1be

trunk/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() {
 }

trunk/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() {}