Test fixes and rebase conflicts

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index e6d2a691cf5630467f1edf4aef3b12b756be7eb2..3c92fa02f2040fbfc738fbde38de4115d275fed9 100644 (file)
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -12,7 +12,6 @@
 
 #![feature(box_syntax)]
 #![feature(collections)]
-#![feature(core)]
 #![feature(int_uint)]
 #![feature(io)]
 #![feature(os)]

diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
index 72832cb946680c07e1619408d702785ae9ccbcb1..a3cae259fd3e5da758c15b5152d9550b7ac2e1fc 100644 (file)
--- a/src/libgetopts/lib.rs
+++ b/src/libgetopts/lib.rs
@@ -90,7 +90,6 @@
 
 #![deny(missing_docs)]
 #![feature(collections)]
-#![feature(core)]
 #![feature(int_uint)]
 #![feature(slicing_syntax)]
 #![feature(staged_api)]

diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index d95d0863ca81f6e9003bac268e010324835105ca..94e4012c5ee13f14a8c1fd9b51d18c193b854850 100644 (file)
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -1930,7 +1930,7 @@ pub mod extra {
                     pub iSecurityScheme: c_int,
                     pub dwMessageSize: DWORD,
                     pub dwProviderReserved: DWORD,
-                    pub szProtocol: [u8; WSAPROTOCOL_LEN as usize + 1],
+                    pub szProtocol: [u8; WSAPROTOCOL_LEN as usize + 1us],
                 }
 
                 pub type LPWSAPROTOCOL_INFO = *mut WSAPROTOCOL_INFO;

diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 219c9baf4c8925a6a742917f42da6064febe825c..084152f107c1d71561eba30b35fa502f49b901d0 100644 (file)
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -52,7 +52,6 @@
 
 #![feature(box_syntax)]
 #![feature(collections)]
-#![feature(core)]
 #![feature(int_uint)]
 #![feature(io)]
 #![feature(path)]

diff --git a/src/test/compile-fail/issue-17551.rs b/src/test/compile-fail/issue-17551.rs
index b19a7703b85605e49bbc807bec3c1edd0159ff02..e037ba92b4a6a02e749552bfb6b37b559e06be1f 100644 (file)
--- a/src/test/compile-fail/issue-17551.rs
+++ b/src/test/compile-fail/issue-17551.rs
@@ -13,6 +13,6 @@
 struct B<T>;
 
 fn main() {
-    let foo = B;
-    let closure = || foo; //~ ERROR unable to infer enough type information
+    let foo = B; //~ ERROR: unable to infer enough type information
+    let closure = || foo;
 }

diff --git a/src/test/compile-fail/issue-17999.rs b/src/test/compile-fail/issue-17999.rs
index f4c0a9c38c3fc6171337ee047616eec9e4cac7e4..88945f80eae91a701a612fd9d95d077d7c4554db 100644 (file)
--- a/src/test/compile-fail/issue-17999.rs
+++ b/src/test/compile-fail/issue-17999.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![deny(unused_variables)]
-#![feature(core)]
 
 fn main() {
     for _ in 1..101 {

diff --git a/src/test/compile-fail/issue-20801.rs b/src/test/compile-fail/issue-20801.rs
index a2565e88467643145af4be340c0d959d8019b4f5..929c8ec0fd684eef81bed84c67e68fe818c201cd 100644 (file)
--- a/src/test/compile-fail/issue-20801.rs
+++ b/src/test/compile-fail/issue-20801.rs
@@ -34,10 +34,10 @@ fn const_ptr() -> *const T {
 
 pub fn main() {
     let a = unsafe { *mut_ref() };
-    //~^ ERROR cannot move out of dereference of borrowed content
+    //~^ ERROR cannot move out of borrowed content
 
     let b = unsafe { *imm_ref() };
-    //~^ ERROR cannot move out of dereference of borrowed content
+    //~^ ERROR cannot move out of borrowed content
 
     let c = unsafe { *mut_ptr() };
     //~^ ERROR cannot move out of dereference of unsafe pointer

diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs
index a2711d532d2cc4023eb81ee3e2941c82ba0ff45c..79df16c8979decc1ce2b5617cc4b18e3f696d6e8 100644 (file)
--- a/src/test/compile-fail/issue-2150.rs
+++ b/src/test/compile-fail/issue-2150.rs
@@ -11,7 +11,6 @@
 #![deny(unreachable_code)]
 #![allow(unused_variables)]
 #![allow(dead_code)]
-#![feature(core)]
 
 fn fail_len(v: Vec<isize> ) -> usize {
     let mut i = 3;

diff --git a/src/test/compile-fail/liveness-unused.rs b/src/test/compile-fail/liveness-unused.rs
index d4238120d06cd32ba1234cde61d68c783e35f71c..ac4b8a5f3090b09102e7452c2af3277ebe1b339c 100644 (file)
--- a/src/test/compile-fail/liveness-unused.rs
+++ b/src/test/compile-fail/liveness-unused.rs
@@ -11,7 +11,6 @@
 #![deny(unused_variables)]
 #![deny(unused_assignments)]
 #![allow(dead_code, non_camel_case_types)]
-#![feature(core)]
 
 fn f1(x: isize) {
     //~^ ERROR unused variable: `x`

diff --git a/src/test/run-make/issue-22131/Makefile b/src/test/run-make/issue-22131/Makefile
index 46d89f0e2a65e53bf78cab83737567daa509ebf2..0f927320c4e58b0e29be1498f3f6677d099de122 100644 (file)
--- a/src/test/run-make/issue-22131/Makefile
+++ b/src/test/run-make/issue-22131/Makefile
@@ -2,5 +2,6 @@
 
 all: foo.rs
        $(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs
-       $(RUSTDOC) --test --cfg 'feature="bar"' -L $(TMPDIR) foo.rs |\
-       grep --quiet 'test foo_0 ... ok'
+       $(HOST_RPATH_ENV) $(RUSTDOC) --test --cfg 'feature="bar"' \
+               -L $(TMPDIR) foo.rs |\
+               grep --quiet 'test foo_0 ... ok'