Skip to content

Commit 021f2ea

Browse files
committed
---
yaml --- r: 187421 b: refs/heads/try c: 060661d h: refs/heads/master i: 187419: 0f4b2f2 v: v3
1 parent b10da64 commit 021f2ea

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: eafdc7135b79d2e51da740b67946512d949632a1
5+
refs/heads/try: 060661d2b4a323c83a1bf043234eae8a344ff6aa
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcore/str/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,7 @@ impl<'a, P: Pattern<'a>> Iterator for SplitStr<'a, P> {
939939
type Item = &'a str;
940940

941941
#[inline]
942+
#[allow(deprecated)]
942943
fn next(&mut self) -> Option<&'a str> {
943944
Iterator::next(&mut self.0)
944945
}

branches/try/src/libstd/sync/mpsc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ impl<T> !Sync for SyncSender<T> {}
384384
/// contains the data being sent as a payload so it can be recovered.
385385
#[stable(feature = "rust1", since = "1.0.0")]
386386
#[derive(PartialEq, Eq, Clone, Copy)]
387-
pub struct SendError<T>(pub T);
387+
pub struct SendError<T>(#[stable(feature = "rust1", since = "1.0.0")] pub T);
388388

389389
/// An error returned from the `recv` function on a `Receiver`.
390390
///

branches/try/src/libstd/thread_local/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ pub struct Key<T> {
105105
// This is trivially devirtualizable by LLVM because we never store anything
106106
// to this field and rustc can declare the `static` as constant as well.
107107
#[doc(hidden)]
108+
#[unstable(feature = "thread_local_internals")]
108109
pub inner: fn() -> &'static __impl::KeyInner<UnsafeCell<Option<T>>>,
109110

110111
// initialization routine to invoke to create a value
111112
#[doc(hidden)]
113+
#[unstable(feature = "thread_local_internals")]
112114
pub init: fn() -> T,
113115
}
114116

0 commit comments

Comments
 (0)