Skip to content

Commit 4281bd1

Browse files
committed
rollup merge of #20754: nikomatsakis/int-feature
Conflicts: src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs src/test/compile-fail/issue-2590.rs src/test/compile-fail/lint-stability.rs src/test/compile-fail/slice-mut-2.rs src/test/compile-fail/std-uncopyable-atomics.rs
2 parents 8ed88c1 + a661bd6 commit 4281bd1

File tree

835 files changed

+2404
-2135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

835 files changed

+2404
-2135
lines changed

src/compiletest/compiletest.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#![allow(unknown_features)]
1313
#![feature(slicing_syntax, unboxed_closures)]
1414
#![feature(box_syntax)]
15+
#![feature(int_uint)]
1516

1617
#![deny(warnings)]
1718

src/liballoc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
#![allow(unknown_features)]
6969
#![feature(lang_items, unsafe_destructor)]
7070
#![feature(box_syntax)]
71+
#![allow(unknown_features)] #![feature(int_uint)]
7172

7273
#[macro_use]
7374
extern crate core;

src/libarena/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#![feature(unsafe_destructor)]
3333
#![feature(unboxed_closures)]
3434
#![feature(box_syntax)]
35+
#![allow(unknown_features)] #![feature(int_uint)]
3536
#![allow(missing_docs)]
3637

3738
extern crate alloc;

src/libcollections/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![feature(box_syntax)]
2828
#![feature(unboxed_closures)]
2929
#![feature(old_impl_check)]
30+
#![allow(unknown_features)] #![feature(int_uint)]
3031
#![no_std]
3132

3233
#[macro_use]

src/libcore/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@
5959
#![no_std]
6060
#![allow(unknown_features, raw_pointer_derive)]
6161
#![cfg_attr(stage0, allow(unused_attributes))]
62-
#![feature(intrinsics, lang_items)]
62+
#![allow(unknown_features)] #![feature(intrinsics, lang_items)]
6363
#![feature(simd, unsafe_destructor, slicing_syntax)]
6464
#![feature(unboxed_closures)]
65+
#![allow(unknown_features)] #![feature(int_uint)]
6566
#![deny(missing_docs)]
6667

6768
#[macro_use]

src/libcore/macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ macro_rules! panic {
1515
panic!("explicit panic")
1616
);
1717
($msg:expr) => ({
18-
static _MSG_FILE_LINE: (&'static str, &'static str, uint) = ($msg, file!(), line!());
18+
static _MSG_FILE_LINE: (&'static str, &'static str, usize) = ($msg, file!(), line!());
1919
::core::panicking::panic(&_MSG_FILE_LINE)
2020
});
2121
($fmt:expr, $($arg:tt)*) => ({
2222
// The leading _'s are to avoid dead code warnings if this is
2323
// used inside a dead function. Just `#[allow(dead_code)]` is
2424
// insufficient, since the user may have
2525
// `#[forbid(dead_code)]` and which cannot be overridden.
26-
static _FILE_LINE: (&'static str, uint) = (file!(), line!());
26+
static _FILE_LINE: (&'static str, usize) = (file!(), line!());
2727
::core::panicking::panic_fmt(format_args!($fmt, $($arg)*), &_FILE_LINE)
2828
});
2929
}

src/libcoretest/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![feature(unsafe_destructor, slicing_syntax)]
1212
#![feature(unboxed_closures)]
1313
#![feature(box_syntax)]
14+
#![allow(unknown_features)] #![feature(int_uint)]
1415

1516
extern crate core;
1617
extern crate test;

src/libflate/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#![crate_name = "flate"]
1818
#![unstable]
1919
#![staged_api]
20+
#![allow(unknown_features)] #![feature(int_uint)]
2021
#![crate_type = "rlib"]
2122
#![crate_type = "dylib"]
2223
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

src/libfmt_macros/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
html_playground_url = "http://play.rust-lang.org/")]
2626

2727
#![feature(slicing_syntax)]
28+
#![allow(unknown_features)] #![feature(int_uint)]
2829

2930
pub use self::Piece::*;
3031
pub use self::Position::*;

src/libgetopts/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
html_root_url = "http://doc.rust-lang.org/nightly/",
8888
html_playground_url = "http://play.rust-lang.org/")]
8989
#![feature(slicing_syntax)]
90+
#![allow(unknown_features)] #![feature(int_uint)]
9091
#![deny(missing_docs)]
9192

9293
#[cfg(test)] #[macro_use] extern crate log;

0 commit comments

Comments
 (0)