about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-27 11:42:29 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-02-27 20:37:36 +0530
commit5d4e01766bd0b3b171149d41effe5564caf0a38b (patch)
treeed4f5374ed8114ef813c415f8bfb6ca6e33de3a9 /src/libstd
parentbd0d8e47e53f25bbd50418a0f117973c366c1b08 (diff)
parent060661d2b4a323c83a1bf043234eae8a344ff6aa (diff)
downloadrust-5d4e01766bd0b3b171149d41effe5564caf0a38b.tar.gz
rust-5d4e01766bd0b3b171149d41effe5564caf0a38b.zip
Rollup merge of #22803 - huonw:field-stability, r=alexcrichton
 We were recording stability attributes applied to fields in the
compiler, and even annotating it in the libs, but the compiler didn't
actually do the checks to give errors/warnings in user crates.

Details in the commit messages.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/old_io/mem.rs1
-rw-r--r--src/libstd/sync/mpsc/mod.rs2
-rw-r--r--src/libstd/thread_local/mod.rs2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs
index c08a2c1f477..e6a8b90ea33 100644
--- a/src/libstd/old_io/mem.rs
+++ b/src/libstd/old_io/mem.rs
@@ -102,6 +102,7 @@ impl MemWriter {
 
 impl Writer for MemWriter {
     #[inline]
+    #[allow(deprecated)]
     fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
         self.buf.push_all(buf);
         Ok(())
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 7bd1f3542eb..1310d476f8e 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -384,7 +384,7 @@ impl<T> !Sync for SyncSender<T> {}
 /// contains the data being sent as a payload so it can be recovered.
 #[stable(feature = "rust1", since = "1.0.0")]
 #[derive(PartialEq, Eq, Clone, Copy)]
-pub struct SendError<T>(pub T);
+pub struct SendError<T>(#[stable(feature = "rust1", since = "1.0.0")] pub T);
 
 /// An error returned from the `recv` function on a `Receiver`.
 ///
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index d65156dae96..764c7d730cb 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -105,10 +105,12 @@ pub struct Key<T> {
     // This is trivially devirtualizable by LLVM because we never store anything
     // to this field and rustc can declare the `static` as constant as well.
     #[doc(hidden)]
+    #[unstable(feature = "thread_local_internals")]
     pub inner: fn() -> &'static __impl::KeyInner<UnsafeCell<Option<T>>>,
 
     // initialization routine to invoke to create a value
     #[doc(hidden)]
+    #[unstable(feature = "thread_local_internals")]
     pub init: fn() -> T,
 }