New upstream version 1.14.0+dfsg1

[rustc.git] / src / test / compile-fail / name-clash-nullary.rs

diff --git a/src/test/compile-fail/name-clash-nullary.rs b/src/test/compile-fail/name-clash-nullary.rs
index 2e2d53c4d40b6400854c1bcc3c15a1296f06ffdb..4c76c4b8b0265662e236c3024bb58d395af6e117 100644 (file)
--- a/src/test/compile-fail/name-clash-nullary.rs
+++ b/src/test/compile-fail/name-clash-nullary.rs
@@ -11,7 +11,7 @@
 use std::option::*;
 
 fn main() {
-  let None: isize = 42; //~ ERROR let bindings cannot shadow variants
+  let None: isize = 42; //~ ERROR let bindings cannot shadow unit variants
   log(debug, None);
   //~^ ERROR unresolved name `debug`
   //~| ERROR unresolved name `log`