Skip to content

Commit 600baf9

Browse files
seckarseckar
committed
---
yaml --- r: 232437 b: refs/heads/try c: ab45e51 h: refs/heads/master i: 232435: 6db221f v: v3
1 parent ca2ecb6 commit 600baf9

File tree

146 files changed

+1552
-1540
lines changed

Some content is hidden

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

146 files changed

+1552
-1540
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 9165a4e2dcaaa878a33379c6ff097c68f0ca0485
4+
refs/heads/try: ab45e51afa6cfc437841434d1b40790511a75afb
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/src/liballoc/arc.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Arc<U>> for Arc<T> {}
137137
/// used to break cycles between `Arc` pointers.
138138
#[unsafe_no_drop_flag]
139139
#[unstable(feature = "arc_weak",
140-
reason = "Weak pointers may not belong in this module.",
141-
issue = "27718")]
140+
reason = "Weak pointers may not belong in this module.")]
142141
pub struct Weak<T: ?Sized> {
143142
// FIXME #12808: strange name to try to avoid interfering with
144143
// field accesses of the contained type via Deref
@@ -210,8 +209,7 @@ impl<T: ?Sized> Arc<T> {
210209
/// let weak_five = five.downgrade();
211210
/// ```
212211
#[unstable(feature = "arc_weak",
213-
reason = "Weak pointers may not belong in this module.",
214-
issue = "27718")]
212+
reason = "Weak pointers may not belong in this module.")]
215213
pub fn downgrade(&self) -> Weak<T> {
216214
loop {
217215
// This Relaxed is OK because we're checking the value in the CAS
@@ -236,14 +234,14 @@ impl<T: ?Sized> Arc<T> {
236234

237235
/// Get the number of weak references to this value.
238236
#[inline]
239-
#[unstable(feature = "arc_counts", issue = "27718")]
237+
#[unstable(feature = "arc_counts")]
240238
pub fn weak_count(this: &Arc<T>) -> usize {
241239
this.inner().weak.load(SeqCst) - 1
242240
}
243241

244242
/// Get the number of strong references to this value.
245243
#[inline]
246-
#[unstable(feature = "arc_counts", issue = "27718")]
244+
#[unstable(feature = "arc_counts")]
247245
pub fn strong_count(this: &Arc<T>) -> usize {
248246
this.inner().strong.load(SeqCst)
249247
}
@@ -351,7 +349,7 @@ impl<T: Clone> Arc<T> {
351349
/// let mut_five = Arc::make_unique(&mut five);
352350
/// ```
353351
#[inline]
354-
#[unstable(feature = "arc_unique", issue = "27718")]
352+
#[unstable(feature = "arc_unique")]
355353
pub fn make_unique(this: &mut Arc<T>) -> &mut T {
356354
// Note that we hold both a strong reference and a weak reference.
357355
// Thus, releasing our strong reference only will not, by itself, cause
@@ -429,7 +427,7 @@ impl<T: ?Sized> Arc<T> {
429427
/// # }
430428
/// ```
431429
#[inline]
432-
#[unstable(feature = "arc_unique", issue = "27718")]
430+
#[unstable(feature = "arc_unique")]
433431
pub fn get_mut(this: &mut Arc<T>) -> Option<&mut T> {
434432
if this.is_unique() {
435433
// This unsafety is ok because we're guaranteed that the pointer
@@ -543,8 +541,7 @@ impl<T: ?Sized> Drop for Arc<T> {
543541
}
544542

545543
#[unstable(feature = "arc_weak",
546-
reason = "Weak pointers may not belong in this module.",
547-
issue = "27718")]
544+
reason = "Weak pointers may not belong in this module.")]
548545
impl<T: ?Sized> Weak<T> {
549546
/// Upgrades a weak reference to a strong reference.
550547
///
@@ -592,8 +589,7 @@ impl<T: ?Sized> Weak<T> {
592589
}
593590

594591
#[unstable(feature = "arc_weak",
595-
reason = "Weak pointers may not belong in this module.",
596-
issue = "27718")]
592+
reason = "Weak pointers may not belong in this module.")]
597593
impl<T: ?Sized> Clone for Weak<T> {
598594
/// Makes a clone of the `Weak<T>`.
599595
///

‎branches/try/src/liballoc/boxed.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,13 @@ use core::raw::{TraitObject};
8585
/// ```
8686
#[lang = "exchange_heap"]
8787
#[unstable(feature = "box_heap",
88-
reason = "may be renamed; uncertain about custom allocator design",
89-
issue = "27779")]
88+
reason = "may be renamed; uncertain about custom allocator design")]
9089
pub const HEAP: ExchangeHeapSingleton =
9190
ExchangeHeapSingleton { _force_singleton: () };
9291

9392
/// This the singleton type used solely for `boxed::HEAP`.
9493
#[unstable(feature = "box_heap",
95-
reason = "may be renamed; uncertain about custom allocator design",
96-
issue = "27779")]
94+
reason = "may be renamed; uncertain about custom allocator design")]
9795
#[derive(Copy, Clone)]
9896
pub struct ExchangeHeapSingleton { _force_singleton: () }
9997

@@ -123,9 +121,7 @@ pub struct Box<T: ?Sized>(Unique<T>);
123121
/// the fact that the `align_of` intrinsic currently requires the
124122
/// input type to be Sized (which I do not think is strictly
125123
/// necessary).
126-
#[unstable(feature = "placement_in",
127-
reason = "placement box design is still being worked out.",
128-
issue = "27779")]
124+
#[unstable(feature = "placement_in", reason = "placement box design is still being worked out.")]
129125
pub struct IntermediateBox<T: ?Sized>{
130126
ptr: *mut u8,
131127
size: usize,
@@ -226,8 +222,7 @@ impl<T : ?Sized> Box<T> {
226222
/// lead to memory problems like double-free, for example if the
227223
/// function is called twice on the same raw pointer.
228224
#[unstable(feature = "box_raw",
229-
reason = "may be renamed or moved out of Box scope",
230-
issue = "27768")]
225+
reason = "may be renamed or moved out of Box scope")]
231226
#[inline]
232227
// NB: may want to be called from_ptr, see comments on CStr::from_ptr
233228
pub unsafe fn from_raw(raw: *mut T) -> Self {
@@ -250,8 +245,7 @@ impl<T : ?Sized> Box<T> {
250245
/// let raw = Box::into_raw(seventeen);
251246
/// let boxed_again = unsafe { Box::from_raw(raw) };
252247
/// ```
253-
#[unstable(feature = "box_raw", reason = "may be renamed",
254-
issue = "27768")]
248+
#[unstable(feature = "box_raw", reason = "may be renamed")]
255249
#[inline]
256250
// NB: may want to be called into_ptr, see comments on CStr::from_ptr
257251
pub fn into_raw(b: Box<T>) -> *mut T {
@@ -476,7 +470,7 @@ impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {}
476470
/// }
477471
/// ```
478472
#[rustc_paren_sugar]
479-
#[unstable(feature = "fnbox", reason = "Newly introduced", issue = "0")]
473+
#[unstable(feature = "fnbox", reason = "Newly introduced")]
480474
pub trait FnBox<A> {
481475
type Output;
482476

‎branches/try/src/liballoc/heap.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
reason = "the precise API and guarantees it provides may be tweaked \
1313
slightly, especially to possibly take into account the \
1414
types being stored to make room for a future \
15-
tracing garbage collector",
16-
issue = "27700")]
15+
tracing garbage collector")]
1716

1817
use core::{isize, usize};
1918

‎branches/try/src/liballoc/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@
6464
#![allow(unused_attributes)]
6565
#![unstable(feature = "alloc",
6666
reason = "this library is unlikely to be stabilized in its current \
67-
form or name",
68-
issue = "27783")]
67+
form or name")]
6968
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
7069
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
7170
html_root_url = "https://doc.rust-lang.org/nightly/",
@@ -132,8 +131,7 @@ pub mod raw_vec;
132131
/// Common out-of-memory routine
133132
#[cold]
134133
#[inline(never)]
135-
#[unstable(feature = "oom", reason = "not a scrutinized interface",
136-
issue = "27700")]
134+
#[unstable(feature = "oom", reason = "not a scrutinized interface")]
137135
pub fn oom() -> ! {
138136
// FIXME(#14674): This really needs to do something other than just abort
139137
// here, but any printing done must be *guaranteed* to not

‎branches/try/src/liballoc/rc.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl<T> Rc<T> {
238238
/// assert_eq!(Rc::try_unwrap(x), Err(Rc::new(4)));
239239
/// ```
240240
#[inline]
241-
#[unstable(feature = "rc_unique", issue = "27718")]
241+
#[unstable(feature = "rc_unique")]
242242
pub fn try_unwrap(rc: Rc<T>) -> Result<T, Rc<T>> {
243243
if Rc::is_unique(&rc) {
244244
unsafe {
@@ -271,21 +271,20 @@ impl<T: ?Sized> Rc<T> {
271271
/// let weak_five = five.downgrade();
272272
/// ```
273273
#[unstable(feature = "rc_weak",
274-
reason = "Weak pointers may not belong in this module",
275-
issue = "27718")]
274+
reason = "Weak pointers may not belong in this module")]
276275
pub fn downgrade(&self) -> Weak<T> {
277276
self.inc_weak();
278277
Weak { _ptr: self._ptr }
279278
}
280279

281280
/// Get the number of weak references to this value.
282281
#[inline]
283-
#[unstable(feature = "rc_counts", issue = "27718")]
282+
#[unstable(feature = "rc_counts")]
284283
pub fn weak_count(this: &Rc<T>) -> usize { this.weak() - 1 }
285284

286285
/// Get the number of strong references to this value.
287286
#[inline]
288-
#[unstable(feature = "rc_counts", issue= "27718")]
287+
#[unstable(feature = "rc_counts")]
289288
pub fn strong_count(this: &Rc<T>) -> usize { this.strong() }
290289

291290
/// Returns true if there are no other `Rc` or `Weak<T>` values that share
@@ -303,7 +302,7 @@ impl<T: ?Sized> Rc<T> {
303302
/// assert!(Rc::is_unique(&five));
304303
/// ```
305304
#[inline]
306-
#[unstable(feature = "rc_unique", issue = "27718")]
305+
#[unstable(feature = "rc_unique")]
307306
pub fn is_unique(rc: &Rc<T>) -> bool {
308307
Rc::weak_count(rc) == 0 && Rc::strong_count(rc) == 1
309308
}
@@ -328,7 +327,7 @@ impl<T: ?Sized> Rc<T> {
328327
/// assert!(Rc::get_mut(&mut x).is_none());
329328
/// ```
330329
#[inline]
331-
#[unstable(feature = "rc_unique", issue = "27718")]
330+
#[unstable(feature = "rc_unique")]
332331
pub fn get_mut(rc: &mut Rc<T>) -> Option<&mut T> {
333332
if Rc::is_unique(rc) {
334333
let inner = unsafe { &mut **rc._ptr };
@@ -357,7 +356,7 @@ impl<T: Clone> Rc<T> {
357356
/// let mut_five = five.make_unique();
358357
/// ```
359358
#[inline]
360-
#[unstable(feature = "rc_unique", issue = "27718")]
359+
#[unstable(feature = "rc_unique")]
361360
pub fn make_unique(&mut self) -> &mut T {
362361
if !Rc::is_unique(self) {
363362
*self = Rc::new((**self).clone())
@@ -654,8 +653,7 @@ impl<T> fmt::Pointer for Rc<T> {
654653
/// See the [module level documentation](./index.html) for more.
655654
#[unsafe_no_drop_flag]
656655
#[unstable(feature = "rc_weak",
657-
reason = "Weak pointers may not belong in this module.",
658-
issue = "27718")]
656+
reason = "Weak pointers may not belong in this module.")]
659657
pub struct Weak<T: ?Sized> {
660658
// FIXME #12808: strange names to try to avoid interfering with
661659
// field accesses of the contained type via Deref
@@ -668,8 +666,7 @@ impl<T: ?Sized> !marker::Sync for Weak<T> {}
668666
impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Weak<U>> for Weak<T> {}
669667

670668
#[unstable(feature = "rc_weak",
671-
reason = "Weak pointers may not belong in this module.",
672-
issue = "27718")]
669+
reason = "Weak pointers may not belong in this module.")]
673670
impl<T: ?Sized> Weak<T> {
674671

675672
/// Upgrades a weak reference to a strong reference.
@@ -749,8 +746,7 @@ impl<T: ?Sized> Drop for Weak<T> {
749746
}
750747

751748
#[unstable(feature = "rc_weak",
752-
reason = "Weak pointers may not belong in this module.",
753-
issue = "27718")]
749+
reason = "Weak pointers may not belong in this module.")]
754750
impl<T: ?Sized> Clone for Weak<T> {
755751

756752
/// Makes a clone of the `Weak<T>`.

‎branches/try/src/liballoc_jemalloc/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#![cfg_attr(not(stage0), allocator)]
1717
#![unstable(feature = "alloc_jemalloc",
1818
reason = "this library is unlikely to be stabilized in its current \
19-
form or name",
20-
issue = "27783")]
19+
form or name")]
2120
#![feature(allocator)]
2221
#![feature(libc)]
2322
#![feature(no_std)]

‎branches/try/src/liballoc_system/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#![cfg_attr(not(stage0), allocator)]
1717
#![unstable(feature = "alloc_system",
1818
reason = "this library is unlikely to be stabilized in its current \
19-
form or name",
20-
issue = "27783")]
19+
form or name")]
2120
#![feature(allocator)]
2221
#![feature(libc)]
2322
#![feature(no_std)]

‎branches/try/src/libarena/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// Do not remove on snapshot creation. Needed for bootstrap. (Issue #22364)
2323
#![cfg_attr(stage0, feature(custom_attribute))]
2424
#![crate_name = "arena"]
25-
#![unstable(feature = "rustc_private", issue = "27812")]
25+
#![unstable(feature = "rustc_private")]
2626
#![staged_api]
2727
#![crate_type = "rlib"]
2828
#![crate_type = "dylib"]

‎branches/try/src/libcollections/binary_heap.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,7 @@ impl<T: Ord> BinaryHeap<T> {
547547
#[inline]
548548
#[unstable(feature = "drain",
549549
reason = "matches collection reform specification, \
550-
waiting for dust to settle",
551-
issue = "27711")]
550+
waiting for dust to settle")]
552551
pub fn drain(&mut self) -> Drain<T> {
553552
Drain { iter: self.data.drain(..) }
554553
}
@@ -686,7 +685,7 @@ impl<T> DoubleEndedIterator for IntoIter<T> {
686685
impl<T> ExactSizeIterator for IntoIter<T> {}
687686

688687
/// An iterator that drains a `BinaryHeap`.
689-
#[unstable(feature = "drain", reason = "recent addition", issue = "27711")]
688+
#[unstable(feature = "drain", reason = "recent addition")]
690689
pub struct Drain<'a, T: 'a> {
691690
iter: vec::Drain<'a, T>,
692691
}

‎branches/try/src/libcollections/borrow.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ impl<'a, B: ?Sized> Hash for Cow<'a, B> where B: Hash + ToOwned
344344
}
345345

346346
/// Trait for moving into a `Cow`.
347-
#[unstable(feature = "into_cow", reason = "may be replaced by `convert::Into`",
348-
issue = "27735")]
347+
#[unstable(feature = "into_cow", reason = "may be replaced by `convert::Into`")]
349348
pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
350349
/// Moves `self` into `Cow`
351350
fn into_cow(self) -> Cow<'a, B>;

‎branches/try/src/libcollections/btree/map.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ impl<K: Ord, V> BTreeMap<K, V> {
157157
/// Makes a new empty BTreeMap with the given B.
158158
///
159159
/// B cannot be less than 2.
160-
#[unstable(feature = "btree_b",
161-
reason = "probably want this to be on the type, eventually",
162-
issue = "27795")]
163160
pub fn with_b(b: usize) -> BTreeMap<K, V> {
164161
assert!(b > 1, "B must be greater than 1");
165162
BTreeMap {
@@ -1507,8 +1504,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
15071504
/// assert_eq!(Some((&5, &"b")), map.range(Included(&4), Unbounded).next());
15081505
/// ```
15091506
#[unstable(feature = "btree_range",
1510-
reason = "matches collection reform specification, waiting for dust to settle",
1511-
issue = "27787")]
1507+
reason = "matches collection reform specification, waiting for dust to settle")]
15121508
pub fn range<Min: ?Sized + Ord = K, Max: ?Sized + Ord = K>(&self, min: Bound<&Min>,
15131509
max: Bound<&Max>)
15141510
-> Range<K, V> where
@@ -1541,8 +1537,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
15411537
/// }
15421538
/// ```
15431539
#[unstable(feature = "btree_range",
1544-
reason = "matches collection reform specification, waiting for dust to settle",
1545-
issue = "27787")]
1540+
reason = "matches collection reform specification, waiting for dust to settle")]
15461541
pub fn range_mut<Min: ?Sized + Ord = K, Max: ?Sized + Ord = K>(&mut self, min: Bound<&Min>,
15471542
max: Bound<&Max>)
15481543
-> RangeMut<K, V> where

‎branches/try/src/libcollections/btree/set.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ impl<T: Ord> BTreeSet<T> {
101101
///
102102
/// B cannot be less than 2.
103103
#[unstable(feature = "btree_b",
104-
reason = "probably want this to be on the type, eventually",
105-
issue = "27795")]
104+
reason = "probably want this to be on the type, eventually")]
106105
pub fn with_b(b: usize) -> BTreeSet<T> {
107106
BTreeSet { map: BTreeMap::with_b(b) }
108107
}
@@ -155,8 +154,7 @@ impl<T: Ord> BTreeSet<T> {
155154
/// assert_eq!(Some(&5), set.range(Included(&4), Unbounded).next());
156155
/// ```
157156
#[unstable(feature = "btree_range",
158-
reason = "matches collection reform specification, waiting for dust to settle",
159-
issue = "27787")]
157+
reason = "matches collection reform specification, waiting for dust to settle")]
160158
pub fn range<'a, Min: ?Sized + Ord = T, Max: ?Sized + Ord = T>(&'a self, min: Bound<&Min>,
161159
max: Bound<&Max>)
162160
-> Range<'a, T> where

‎branches/try/src/libcollections/enum_set.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
1616
#![unstable(feature = "enumset",
1717
reason = "matches collection reform specification, \
18-
waiting for dust to settle",
19-
issue = "0")]
18+
waiting for dust to settle")]
2019

2120
use core::marker;
2221
use core::fmt;

‎branches/try/src/libcollections/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
#![crate_type = "rlib"]
2121
#![unstable(feature = "collections",
2222
reason = "library is unlikely to be stabilized with the current \
23-
layout and name, use std::collections instead",
24-
issue = "27783")]
23+
layout and name, use std::collections instead")]
2524
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2625
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2726
html_root_url = "https://doc.rust-lang.org/nightly/",
@@ -111,7 +110,7 @@ mod std {
111110
}
112111

113112
/// An endpoint of a range of keys.
114-
#[unstable(feature = "collections_bound", issue = "27711")]
113+
#[unstable(feature = "collections_bound")]
115114
#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
116115
pub enum Bound<T> {
117116
/// An inclusive bound.

0 commit comments

Comments
 (0)