diff options
| -rw-r--r-- | src/compiletest/compiletest.rs | 1 | ||||
| -rw-r--r-- | src/libgetopts/lib.rs | 1 | ||||
| -rw-r--r-- | src/liblibc/lib.rs | 2 | ||||
| -rw-r--r-- | src/libterm/lib.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-17551.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-17999.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-20801.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-2150.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/liveness-unused.rs | 1 | ||||
| -rw-r--r-- | src/test/run-make/issue-22131/Makefile | 5 |
10 files changed, 8 insertions, 13 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index e6d2a691cf5..3c92fa02f20 100644 --- 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 72832cb9466..a3cae259fd3 100644 --- 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 d95d0863ca8..94e4012c5ee 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -1930,7 +1930,7 @@ pub mod types { 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 219c9baf4c8..084152f107c 100644 --- 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 b19a7703b85..e037ba92b4a 100644 --- 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 f4c0a9c38c3..88945f80eae 100644 --- 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 a2565e88467..929c8ec0fd6 100644 --- 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 a2711d532d2..79df16c8979 100644 --- 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 d4238120d06..ac4b8a5f309 100644 --- 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 46d89f0e2a6..0f927320c4e 100644 --- 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' |