Auto merge of #32293 - nikomatsakis:incr-comp-def-path-munging, r=alexcrichton

[rust.git] / src / test / compile-fail / issue-20427.rs

diff --git a/src/test/compile-fail/issue-20427.rs b/src/test/compile-fail/issue-20427.rs
index 96d4fae8b036d0c05b3df7d23fc83fb1b366dce9..99dd22a888cb56508f759f0a2183cfe23354200e 100644 (file)
--- a/src/test/compile-fail/issue-20427.rs
+++ b/src/test/compile-fail/issue-20427.rs
@@ -47,6 +47,8 @@ mod str {
         //~^ ERROR user-defined types or type parameters cannot shadow the primitive types
         use super::bool_ as bool;
         //~^ ERROR user-defined types or type parameters cannot shadow the primitive types
+        use super::{bool_ as str};
+        //~^ ERROR user-defined types or type parameters cannot shadow the primitive types
         use super::char_ as char;
     }
 }
@@ -60,7 +62,7 @@ fn usize<'usize>(usize: &'usize usize) -> &'usize usize { usize }
 fn main() {
     let bool = true;
     match bool {
-        str @ true => if str { i32 as i64 } else { 0 },
+        str @ true => if str { i32 as i64 } else { i64 },
         false => i64,
-    }
+    };
 }