diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-09 16:33:19 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 12:14:59 -0800 |
| commit | bbbb571fee01532f63b105150654db8db0b01bf7 (patch) | |
| tree | e3d8b2c3105e2c0dfb861ccc43b5f02d876c8518 /src/libstd | |
| parent | 446bc899b28e988f4252beca0d1858e7f7d866b1 (diff) | |
| download | rust-bbbb571fee01532f63b105150654db8db0b01bf7.tar.gz rust-bbbb571fee01532f63b105150654db8db0b01bf7.zip | |
rustc: Fix a number of stability lint holes
There are a number of holes that the stability lint did not previously cover,
including:
* Types
* Bounds on type parameters on functions and impls
* Where clauses
* Imports
* Patterns (structs and enums)
These holes have all been fixed by overriding the `visit_path` function on the
AST visitor instead of a few specialized cases. This change also necessitated a
few stability changes:
* The `collections::fmt` module is now stable (it was already supposed to be).
* The `thread_local::imp::Key` type is now stable (it was already supposed to
be).
* The `std::rt::{begin_unwind, begin_unwind_fmt}` functions are now stable.
These are required via the `panic!` macro.
* The `std::old_io::stdio::{println, println_args}` functions are now stable.
These are required by the `print!` and `println!` macros.
* The `ops::{FnOnce, FnMut, Fn}` traits are now `#[stable]`. This is required to
make bounds with these traits stable. Note that manual implementations of
these traits are still gated by default, this stability only allows bounds
such as `F: FnOnce()`.
Additionally, the compiler now has special logic to ignore its own generated
`__test` module for the `--test` harness in terms of stability.
Closes #8962
Closes #16360
Closes #20327
[breaking-change]
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 5 | ||||
| -rw-r--r-- | src/libstd/old_io/mem.rs | 1 | ||||
| -rw-r--r-- | src/libstd/old_io/mod.rs | 38 | ||||
| -rw-r--r-- | src/libstd/old_io/stdio.rs | 6 | ||||
| -rw-r--r-- | src/libstd/os.rs | 1 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/select.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/shared.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/stream.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sync/once.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sys/common/thread.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/c.rs | 8 | ||||
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 7 |
13 files changed, 60 insertions, 46 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 967789dd411..77423cdcd31 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -164,6 +164,7 @@ pub use core::cell; pub use core::clone; #[cfg(not(test))] pub use core::cmp; pub use core::default; +#[allow(deprecated)] pub use core::finally; pub use core::hash; pub use core::intrinsics; @@ -306,8 +307,8 @@ mod std { pub use marker; // used for tls! pub use ops; // used for bitflags! - // The test runner calls ::std::os::args() but really wants realstd - #[cfg(test)] pub use realstd::os as os; + // The test runner calls ::std::env::args() but really wants realstd + #[cfg(test)] pub use realstd::env as env; // The test runner requires std::slice::Vector, so re-export std::slice just for it. // // It is also used in vec![] diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs index 8f32703f200..0f4d9c8b4ea 100644 --- a/src/libstd/old_io/mem.rs +++ b/src/libstd/old_io/mem.rs @@ -66,6 +66,7 @@ impl Writer for Vec<u8> { #[deprecated(since = "1.0.0", reason = "use the Vec<u8> Writer implementation directly")] #[derive(Clone)] +#[allow(deprecated)] pub struct MemWriter { buf: Vec<u8>, } diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index c3e4e7fc80d..14661a483e3 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -249,7 +249,7 @@ use char::CharExt; use default::Default; use error::Error; use fmt; -use int; +use isize; use iter::{Iterator, IteratorExt}; use marker::Sized; use mem::transmute; @@ -265,7 +265,7 @@ use slice::SliceExt; use str::StrExt; use str; use string::String; -use uint; +use usize; use unicode; use vec::Vec; @@ -711,28 +711,28 @@ pub trait Reader { /// /// The number of bytes returned is system-dependent. fn read_le_uint(&mut self) -> IoResult<uint> { - self.read_le_uint_n(uint::BYTES).map(|i| i as uint) + self.read_le_uint_n(usize::BYTES).map(|i| i as uint) } /// Reads a little-endian integer. /// /// The number of bytes returned is system-dependent. fn read_le_int(&mut self) -> IoResult<int> { - self.read_le_int_n(int::BYTES).map(|i| i as int) + self.read_le_int_n(isize::BYTES).map(|i| i as int) } /// Reads a big-endian unsigned integer. /// /// The number of bytes returned is system-dependent. fn read_be_uint(&mut self) -> IoResult<uint> { - self.read_be_uint_n(uint::BYTES).map(|i| i as uint) + self.read_be_uint_n(usize::BYTES).map(|i| i as uint) } /// Reads a big-endian integer. /// /// The number of bytes returned is system-dependent. fn read_be_int(&mut self) -> IoResult<int> { - self.read_be_int_n(int::BYTES).map(|i| i as int) + self.read_be_int_n(isize::BYTES).map(|i| i as int) } /// Reads a big-endian `u64`. @@ -1095,25 +1095,25 @@ pub trait Writer { /// Write a little-endian uint (number of bytes depends on system). #[inline] fn write_le_uint(&mut self, n: uint) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, uint::BYTES, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) } /// Write a little-endian int (number of bytes depends on system). #[inline] fn write_le_int(&mut self, n: int) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, int::BYTES, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) } /// Write a big-endian uint (number of bytes depends on system). #[inline] fn write_be_uint(&mut self, n: uint) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, uint::BYTES, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) } /// Write a big-endian int (number of bytes depends on system). #[inline] fn write_be_int(&mut self, n: int) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, int::BYTES, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) } /// Write a big-endian u64 (8 bytes). @@ -1843,7 +1843,7 @@ mod tests { use self::BadReaderBehavior::*; use super::{IoResult, Reader, MemReader, NoProgress, InvalidInput, Writer}; use prelude::v1::{Ok, Vec, Buffer, SliceExt}; - use uint; + use usize; #[derive(Clone, PartialEq, Debug)] enum BadReaderBehavior { @@ -1890,24 +1890,24 @@ mod tests { #[test] fn test_read_at_least() { let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![GoodBehavior(uint::MAX)]); + vec![GoodBehavior(usize::MAX)]); let buf = &mut [0u8; 5]; assert!(r.read_at_least(1, buf).unwrap() >= 1); assert!(r.read_exact(5).unwrap().len() == 5); // read_exact uses read_at_least assert!(r.read_at_least(0, buf).is_ok()); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![BadBehavior(50), GoodBehavior(uint::MAX)]); + vec![BadBehavior(50), GoodBehavior(usize::MAX)]); assert!(r.read_at_least(1, buf).unwrap() >= 1); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), vec![BadBehavior(1), GoodBehavior(1), - BadBehavior(50), GoodBehavior(uint::MAX)]); + BadBehavior(50), GoodBehavior(usize::MAX)]); assert!(r.read_at_least(1, buf).unwrap() >= 1); assert!(r.read_at_least(1, buf).unwrap() >= 1); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![BadBehavior(uint::MAX)]); + vec![BadBehavior(usize::MAX)]); assert_eq!(r.read_at_least(1, buf).unwrap_err().kind, NoProgress); let mut r = MemReader::new(b"hello, world!".to_vec()); @@ -1918,23 +1918,23 @@ mod tests { #[test] fn test_push_at_least() { let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![GoodBehavior(uint::MAX)]); + vec![GoodBehavior(usize::MAX)]); let mut buf = Vec::new(); assert!(r.push_at_least(1, 5, &mut buf).unwrap() >= 1); assert!(r.push_at_least(0, 5, &mut buf).is_ok()); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![BadBehavior(50), GoodBehavior(uint::MAX)]); + vec![BadBehavior(50), GoodBehavior(usize::MAX)]); assert!(r.push_at_least(1, 5, &mut buf).unwrap() >= 1); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), vec![BadBehavior(1), GoodBehavior(1), - BadBehavior(50), GoodBehavior(uint::MAX)]); + BadBehavior(50), GoodBehavior(usize::MAX)]); assert!(r.push_at_least(1, 5, &mut buf).unwrap() >= 1); assert!(r.push_at_least(1, 5, &mut buf).unwrap() >= 1); let mut r = BadReader::new(MemReader::new(b"hello, world!".to_vec()), - vec![BadBehavior(uint::MAX)]); + vec![BadBehavior(usize::MAX)]); assert_eq!(r.push_at_least(1, 5, &mut buf).unwrap_err().kind, NoProgress); let mut r = MemReader::new(b"hello, world!".to_vec()); diff --git a/src/libstd/old_io/stdio.rs b/src/libstd/old_io/stdio.rs index 70400619bea..0669af9cf9a 100644 --- a/src/libstd/old_io/stdio.rs +++ b/src/libstd/old_io/stdio.rs @@ -48,7 +48,7 @@ use str::StrExt; use string::String; use sys::{fs, tty}; use sync::{Arc, Mutex, MutexGuard, Once, ONCE_INIT}; -use uint; +use usize; use vec::Vec; // And so begins the tale of acquiring a uv handle to a stdio stream on all @@ -383,12 +383,14 @@ pub fn println(s: &str) { /// Similar to `print`, but takes a `fmt::Arguments` structure to be compatible /// with the `format_args!` macro. +#[stable(feature = "rust1", since = "1.0.0")] pub fn print_args(fmt: fmt::Arguments) { with_task_stdout(|io| write!(io, "{}", fmt)) } /// Similar to `println`, but takes a `fmt::Arguments` structure to be /// compatible with the `format_args!` macro. +#[stable(feature = "rust1", since = "1.0.0")] pub fn println_args(fmt: fmt::Arguments) { with_task_stdout(|io| writeln!(io, "{}", fmt)) } @@ -510,7 +512,7 @@ impl Writer for StdWriter { // // [1]: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1232 // [2]: http://www.mail-archive.com/log4net-dev@logging.apache.org/msg00661.html - let max_size = if cfg!(windows) {8192} else {uint::MAX}; + let max_size = if cfg!(windows) {8192} else {usize::MAX}; for chunk in buf.chunks(max_size) { try!(match self.inner { TTY(ref mut tty) => tty.write(chunk), diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 526b5edd4cb..b37f5f7a974 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -317,6 +317,7 @@ pub unsafe fn pipe() -> IoResult<Pipe> { #[cfg(not(target_os="ios"))] #[deprecated(since = "1.0.0", reason = "this function will be removed, use the constants directly")] #[unstable(feature = "os")] +#[allow(deprecated)] pub fn dll_filename(base: &str) -> String { format!("{}{}{}", consts::DLL_PREFIX, base, consts::DLL_SUFFIX) } diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index e064663b9e7..659e787a9ff 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -494,6 +494,7 @@ pub extern fn rust_begin_unwind(msg: fmt::Arguments, /// on (e.g.) the inlining of other functions as possible), by moving /// the actual formatting into this shared place. #[inline(never)] #[cold] +#[stable(since = "1.0.0", feature = "rust1")] pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, uint)) -> ! { use fmt::Writer; @@ -509,6 +510,7 @@ pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, uint)) - /// This is the entry point of unwinding for panic!() and assert!(). #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible +#[stable(since = "1.0.0", feature = "rust1")] pub fn begin_unwind<M: Any + Send>(msg: M, file_line: &(&'static str, uint)) -> ! { // Note that this should be the only allocation performed in this code path. // Currently this means that panic!() on OOM will invoke this code path, diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 85c7572404b..babae93b2d4 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -61,7 +61,7 @@ use core::cell::Cell; use core::marker; use core::mem; use core::ptr; -use core::uint; +use core::usize; use sync::mpsc::{Receiver, RecvError}; use sync::mpsc::blocking::{self, SignalToken}; @@ -228,7 +228,7 @@ impl Select { // A rewrite should focus on avoiding a yield loop, and for now this // implementation is tying us over to a more efficient "don't // iterate over everything every time" implementation. - let mut ready_id = uint::MAX; + let mut ready_id = usize::MAX; for handle in self.iter() { if (*handle).packet.abort_selection() { ready_id = (*handle).id; @@ -236,7 +236,7 @@ impl Select { } // We must have found a ready receiver - assert!(ready_id != uint::MAX); + assert!(ready_id != usize::MAX); return ready_id; } } diff --git a/src/libstd/sync/mpsc/shared.rs b/src/libstd/sync/mpsc/shared.rs index c97af4c6bca..6c31fb92591 100644 --- a/src/libstd/sync/mpsc/shared.rs +++ b/src/libstd/sync/mpsc/shared.rs @@ -23,7 +23,7 @@ pub use self::Failure::*; use core::prelude::*; use core::cmp; -use core::int; +use core::isize; use sync::atomic::{AtomicUsize, AtomicIsize, AtomicBool, Ordering}; use sync::mpsc::blocking::{self, SignalToken}; @@ -33,17 +33,17 @@ use sync::mpsc::select::StartResult; use sync::{Mutex, MutexGuard}; use thread::Thread; -const DISCONNECTED: int = int::MIN; -const FUDGE: int = 1024; +const DISCONNECTED: isize = isize::MIN; +const FUDGE: isize = 1024; #[cfg(test)] -const MAX_STEALS: int = 5; +const MAX_STEALS: isize = 5; #[cfg(not(test))] -const MAX_STEALS: int = 1 << 20; +const MAX_STEALS: isize = 1 << 20; pub struct Packet<T> { queue: mpsc::Queue<T>, cnt: AtomicIsize, // How many items are on this channel - steals: int, // How many times has a port received without blocking? + steals: isize, // How many times has a port received without blocking? to_wake: AtomicUsize, // SignalToken for wake up // The number of channels which are currently using this packet. diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index a03add8c532..ab9bd6b2ed7 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -25,7 +25,7 @@ use self::Message::*; use core::prelude::*; use core::cmp; -use core::int; +use core::isize; use thread::Thread; use sync::atomic::{AtomicIsize, AtomicUsize, Ordering, AtomicBool}; @@ -33,11 +33,11 @@ use sync::mpsc::Receiver; use sync::mpsc::blocking::{self, SignalToken}; use sync::mpsc::spsc_queue as spsc; -const DISCONNECTED: int = int::MIN; +const DISCONNECTED: isize = isize::MIN; #[cfg(test)] -const MAX_STEALS: int = 5; +const MAX_STEALS: isize = 5; #[cfg(not(test))] -const MAX_STEALS: int = 1 << 20; +const MAX_STEALS: isize = 1 << 20; pub struct Packet<T> { queue: spsc::Queue<Message<T>>, // internal queue for all message diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index 2df211f3768..29c2051e5ad 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -13,7 +13,7 @@ //! This primitive is meant to be used to run one-time initialization. An //! example use case would be for initializing an FFI library. -use int; +use isize; use marker::Sync; use mem::drop; use ops::FnOnce; @@ -99,9 +99,9 @@ impl Once { let prev = self.cnt.fetch_add(1, Ordering::SeqCst); if prev < 0 { - // Make sure we never overflow, we'll never have int::MIN + // Make sure we never overflow, we'll never have isize::MIN // simultaneous calls to `call_once` to make this value go back to 0 - self.cnt.store(int::MIN, Ordering::SeqCst); + self.cnt.store(isize::MIN, Ordering::SeqCst); return } @@ -111,7 +111,7 @@ impl Once { let guard = self.mutex.lock(); if self.cnt.load(Ordering::SeqCst) > 0 { f(); - let prev = self.cnt.swap(int::MIN, Ordering::SeqCst); + let prev = self.cnt.swap(isize::MIN, Ordering::SeqCst); self.lock_cnt.store(prev, Ordering::SeqCst); } drop(guard); diff --git a/src/libstd/sys/common/thread.rs b/src/libstd/sys/common/thread.rs index 048e33399a3..b725b6c7e6e 100644 --- a/src/libstd/sys/common/thread.rs +++ b/src/libstd/sys/common/thread.rs @@ -12,7 +12,7 @@ use core::prelude::*; use boxed::Box; use mem; -use uint; +use usize; use libc; use thunk::Thunk; use sys_common::stack; @@ -25,7 +25,7 @@ use sys::{thread, stack_overflow}; #[no_stack_check] pub fn start_thread(main: *mut libc::c_void) -> thread::rust_thread_return { unsafe { - stack::record_os_managed_stack_bounds(0, uint::MAX); + stack::record_os_managed_stack_bounds(0, usize::MAX); let handler = stack_overflow::Handler::new(); let f: Box<Thunk> = mem::transmute(main); f.invoke(()); diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs index cf05733cc18..cd246e8add5 100644 --- a/src/libstd/sys/unix/c.rs +++ b/src/libstd/sys/unix/c.rs @@ -179,20 +179,20 @@ mod select { target_os = "openbsd", target_os = "linux"))] mod select { - use uint; + use usize; use libc; - pub const FD_SETSIZE: uint = 1024; + pub const FD_SETSIZE: usize = 1024; #[repr(C)] pub struct fd_set { // FIXME: shouldn't this be a c_ulong? - fds_bits: [libc::uintptr_t; (FD_SETSIZE / uint::BITS)] + fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS)] } pub fn fd_set(set: &mut fd_set, fd: i32) { let fd = fd as uint; - set.fds_bits[fd / uint::BITS] |= 1 << (fd % uint::BITS); + set.fds_bits[fd / usize::BITS] |= 1 << (fd % usize::BITS); } } diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 9de5fd1c770..0ec241a65e2 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -335,6 +335,7 @@ mod imp { use ptr; #[doc(hidden)] + #[stable(since = "1.0.0", feature = "rust1")] pub struct Key<T> { // Place the inner bits in an `UnsafeCell` to currently get around the // "only Sync statics" restriction. This allows any type to be placed in @@ -342,11 +343,14 @@ mod imp { // // Note that all access requires `T: 'static` so it can't be a type with // any borrowed pointers still. + #[stable(since = "1.0.0", feature = "rust1")] pub inner: UnsafeCell<T>, // Metadata to keep track of the state of the destructor. Remember that // these variables are thread-local, not global. + #[stable(since = "1.0.0", feature = "rust1")] pub dtor_registered: UnsafeCell<bool>, // should be Cell + #[stable(since = "1.0.0", feature = "rust1")] pub dtor_running: UnsafeCell<bool>, // should be Cell } @@ -468,12 +472,15 @@ mod imp { use sys_common::thread_local::StaticKey as OsStaticKey; #[doc(hidden)] + #[stable(since = "1.0.0", feature = "rust1")] pub struct Key<T> { // Statically allocated initialization expression, using an `UnsafeCell` // for the same reasons as above. + #[stable(since = "1.0.0", feature = "rust1")] pub inner: UnsafeCell<T>, // OS-TLS key that we'll use to key off. + #[stable(since = "1.0.0", feature = "rust1")] pub os: OsStaticKey, } |
