Skip to content

Commit b44ee37

Browse files
brsonbrson
committed
grandfathered -> rust1
1 parent b7fe2c5 commit b44ee37

Some content is hidden

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

102 files changed

+1490
-1490
lines changed

‎src/liballoc/arc.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![stable(feature = "grandfathered", since = "1.0.0")]
11+
#![stable(feature = "rust1", since = "1.0.0")]
1212

1313
//! Threadsafe reference-counted boxes (the `Arc<T>` type).
1414
//!
@@ -110,7 +110,7 @@ use heap::deallocate;
110110
/// }
111111
/// ```
112112
#[unsafe_no_drop_flag]
113-
#[stable(feature = "grandfathered", since = "1.0.0")]
113+
#[stable(feature = "rust1", since = "1.0.0")]
114114
pub struct Arc<T> {
115115
// FIXME #12808: strange name to try to avoid interfering with
116116
// field accesses of the contained type via Deref
@@ -157,7 +157,7 @@ impl<T> Arc<T> {
157157
/// let five = Arc::new(5i);
158158
/// ```
159159
#[inline]
160-
#[stable(feature = "grandfathered", since = "1.0.0")]
160+
#[stable(feature = "rust1", since = "1.0.0")]
161161
pub fn new(data: T) -> Arc<T> {
162162
// Start the weak pointer count as 1 which is the weak pointer that's
163163
// held by all the strong pointers (kinda), see std/rc.rs for more info
@@ -210,7 +210,7 @@ pub fn weak_count<T>(this: &Arc<T>) -> uint { this.inner().weak.load(SeqCst) - 1
210210
#[unstable(feature = "alloc")]
211211
pub fn strong_count<T>(this: &Arc<T>) -> uint { this.inner().strong.load(SeqCst) }
212212

213-
#[stable(feature = "grandfathered", since = "1.0.0")]
213+
#[stable(feature = "rust1", since = "1.0.0")]
214214
impl<T> Clone for Arc<T> {
215215
/// Makes a clone of the `Arc<T>`.
216216
///
@@ -247,7 +247,7 @@ impl<T> BorrowFrom<Arc<T>> for T {
247247
}
248248
}
249249

250-
#[stable(feature = "grandfathered", since = "1.0.0")]
250+
#[stable(feature = "rust1", since = "1.0.0")]
251251
impl<T> Deref for Arc<T> {
252252
type Target = T;
253253

@@ -291,7 +291,7 @@ impl<T: Send + Sync + Clone> Arc<T> {
291291
}
292292

293293
#[unsafe_destructor]
294-
#[stable(feature = "grandfathered", since = "1.0.0")]
294+
#[stable(feature = "rust1", since = "1.0.0")]
295295
impl<T: Sync + Send> Drop for Arc<T> {
296296
/// Drops the `Arc<T>`.
297297
///
@@ -421,7 +421,7 @@ impl<T: Sync + Send> Clone for Weak<T> {
421421
}
422422

423423
#[unsafe_destructor]
424-
#[stable(feature = "grandfathered", since = "1.0.0")]
424+
#[stable(feature = "rust1", since = "1.0.0")]
425425
impl<T: Sync + Send> Drop for Weak<T> {
426426
/// Drops the `Weak<T>`.
427427
///
@@ -464,7 +464,7 @@ impl<T: Sync + Send> Drop for Weak<T> {
464464
}
465465
}
466466

467-
#[stable(feature = "grandfathered", since = "1.0.0")]
467+
#[stable(feature = "rust1", since = "1.0.0")]
468468
impl<T: PartialEq> PartialEq for Arc<T> {
469469
/// Equality for two `Arc<T>`s.
470470
///
@@ -496,7 +496,7 @@ impl<T: PartialEq> PartialEq for Arc<T> {
496496
/// ```
497497
fn ne(&self, other: &Arc<T>) -> bool { *(*self) != *(*other) }
498498
}
499-
#[stable(feature = "grandfathered", since = "1.0.0")]
499+
#[stable(feature = "rust1", since = "1.0.0")]
500500
impl<T: PartialOrd> PartialOrd for Arc<T> {
501501
/// Partial comparison for two `Arc<T>`s.
502502
///
@@ -575,11 +575,11 @@ impl<T: PartialOrd> PartialOrd for Arc<T> {
575575
/// ```
576576
fn ge(&self, other: &Arc<T>) -> bool { *(*self) >= *(*other) }
577577
}
578-
#[stable(feature = "grandfathered", since = "1.0.0")]
578+
#[stable(feature = "rust1", since = "1.0.0")]
579579
impl<T: Ord> Ord for Arc<T> {
580580
fn cmp(&self, other: &Arc<T>) -> Ordering { (**self).cmp(&**other) }
581581
}
582-
#[stable(feature = "grandfathered", since = "1.0.0")]
582+
#[stable(feature = "rust1", since = "1.0.0")]
583583
impl<T: Eq> Eq for Arc<T> {}
584584

585585
impl<T: fmt::Show> fmt::Show for Arc<T> {
@@ -588,16 +588,16 @@ impl<T: fmt::Show> fmt::Show for Arc<T> {
588588
}
589589
}
590590

591-
#[stable(feature = "grandfathered", since = "1.0.0")]
591+
#[stable(feature = "rust1", since = "1.0.0")]
592592
impl<T: fmt::String> fmt::String for Arc<T> {
593593
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
594594
fmt::String::fmt(&**self, f)
595595
}
596596
}
597597

598-
#[stable(feature = "grandfathered", since = "1.0.0")]
598+
#[stable(feature = "rust1", since = "1.0.0")]
599599
impl<T: Default + Sync + Send> Default for Arc<T> {
600-
#[stable(feature = "grandfathered", since = "1.0.0")]
600+
#[stable(feature = "rust1", since = "1.0.0")]
601601
fn default() -> Arc<T> { Arc::new(Default::default()) }
602602
}
603603

‎src/liballoc/boxed.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! A unique pointer type.
1212
13-
#![stable(feature = "grandfathered", since = "1.0.0")]
13+
#![stable(feature = "rust1", since = "1.0.0")]
1414

1515
use core::any::Any;
1616
use core::clone::Clone;
@@ -50,30 +50,30 @@ pub static HEAP: () = ();
5050

5151
/// A type that represents a uniquely-owned value.
5252
#[lang = "owned_box"]
53-
#[stable(feature = "grandfathered", since = "1.0.0")]
53+
#[stable(feature = "rust1", since = "1.0.0")]
5454
pub struct Box<T>(Unique<T>);
5555

5656
impl<T> Box<T> {
5757
/// Moves `x` into a freshly allocated box on the global exchange heap.
58-
#[stable(feature = "grandfathered", since = "1.0.0")]
58+
#[stable(feature = "rust1", since = "1.0.0")]
5959
pub fn new(x: T) -> Box<T> {
6060
box x
6161
}
6262
}
6363

64-
#[stable(feature = "grandfathered", since = "1.0.0")]
64+
#[stable(feature = "rust1", since = "1.0.0")]
6565
impl<T: Default> Default for Box<T> {
66-
#[stable(feature = "grandfathered", since = "1.0.0")]
66+
#[stable(feature = "rust1", since = "1.0.0")]
6767
fn default() -> Box<T> { box Default::default() }
6868
}
6969

70-
#[stable(feature = "grandfathered", since = "1.0.0")]
70+
#[stable(feature = "rust1", since = "1.0.0")]
7171
impl<T> Default for Box<[T]> {
72-
#[stable(feature = "grandfathered", since = "1.0.0")]
72+
#[stable(feature = "rust1", since = "1.0.0")]
7373
fn default() -> Box<[T]> { box [] }
7474
}
7575

76-
#[stable(feature = "grandfathered", since = "1.0.0")]
76+
#[stable(feature = "rust1", since = "1.0.0")]
7777
impl<T: Clone> Clone for Box<T> {
7878
/// Returns a copy of the owned box.
7979
#[inline]
@@ -86,14 +86,14 @@ impl<T: Clone> Clone for Box<T> {
8686
}
8787
}
8888

89-
#[stable(feature = "grandfathered", since = "1.0.0")]
89+
#[stable(feature = "rust1", since = "1.0.0")]
9090
impl<T: ?Sized + PartialEq> PartialEq for Box<T> {
9191
#[inline]
9292
fn eq(&self, other: &Box<T>) -> bool { PartialEq::eq(&**self, &**other) }
9393
#[inline]
9494
fn ne(&self, other: &Box<T>) -> bool { PartialEq::ne(&**self, &**other) }
9595
}
96-
#[stable(feature = "grandfathered", since = "1.0.0")]
96+
#[stable(feature = "rust1", since = "1.0.0")]
9797
impl<T: ?Sized + PartialOrd> PartialOrd for Box<T> {
9898
#[inline]
9999
fn partial_cmp(&self, other: &Box<T>) -> Option<Ordering> {
@@ -108,14 +108,14 @@ impl<T: ?Sized + PartialOrd> PartialOrd for Box<T> {
108108
#[inline]
109109
fn gt(&self, other: &Box<T>) -> bool { PartialOrd::gt(&**self, &**other) }
110110
}
111-
#[stable(feature = "grandfathered", since = "1.0.0")]
111+
#[stable(feature = "rust1", since = "1.0.0")]
112112
impl<T: ?Sized + Ord> Ord for Box<T> {
113113
#[inline]
114114
fn cmp(&self, other: &Box<T>) -> Ordering {
115115
Ord::cmp(&**self, &**other)
116116
}
117117
}
118-
#[stable(feature = "grandfathered", since = "1.0.0")]
118+
#[stable(feature = "rust1", since = "1.0.0")]
119119
impl<T: ?Sized + Eq> Eq for Box<T> {}
120120

121121
impl<S: hash::Hasher, T: ?Sized + Hash<S>> Hash<S> for Box<T> {
@@ -135,11 +135,11 @@ impl<S: hash::Hasher, T: ?Sized + Hash<S>> Hash<S> for Box<T> {
135135
pub trait BoxAny {
136136
/// Returns the boxed value if it is of type `T`, or
137137
/// `Err(Self)` if it isn't.
138-
#[stable(feature = "grandfathered", since = "1.0.0")]
138+
#[stable(feature = "rust1", since = "1.0.0")]
139139
fn downcast<T: 'static>(self) -> Result<Box<T>, Self>;
140140
}
141141

142-
#[stable(feature = "grandfathered", since = "1.0.0")]
142+
#[stable(feature = "rust1", since = "1.0.0")]
143143
impl BoxAny for Box<Any> {
144144
#[inline]
145145
fn downcast<T: 'static>(self) -> Result<Box<T>, Box<Any>> {
@@ -164,7 +164,7 @@ impl<T: ?Sized + fmt::Show> fmt::Show for Box<T> {
164164
}
165165
}
166166

167-
#[stable(feature = "grandfathered", since = "1.0.0")]
167+
#[stable(feature = "rust1", since = "1.0.0")]
168168
impl<T: ?Sized + fmt::String> fmt::String for Box<T> {
169169
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
170170
fmt::String::fmt(&**self, f)
@@ -177,14 +177,14 @@ impl fmt::Show for Box<Any> {
177177
}
178178
}
179179

180-
#[stable(feature = "grandfathered", since = "1.0.0")]
180+
#[stable(feature = "rust1", since = "1.0.0")]
181181
impl<T: ?Sized> Deref for Box<T> {
182182
type Target = T;
183183

184184
fn deref(&self) -> &T { &**self }
185185
}
186186

187-
#[stable(feature = "grandfathered", since = "1.0.0")]
187+
#[stable(feature = "rust1", since = "1.0.0")]
188188
impl<T: ?Sized> DerefMut for Box<T> {
189189
fn deref_mut(&mut self) -> &mut T { &mut **self }
190190
}

‎src/liballoc/rc.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
//! }
143143
//! ```
144144
145-
#![stable(feature = "grandfathered", since = "1.0.0")]
145+
#![stable(feature = "rust1", since = "1.0.0")]
146146

147147
use core::borrow::BorrowFrom;
148148
use core::cell::Cell;
@@ -174,7 +174,7 @@ struct RcBox<T> {
174174
/// See the [module level documentation](../index.html) for more details.
175175
#[unsafe_no_drop_flag]
176176
#[cfg(stage0)] // NOTE remove impl after next snapshot
177-
#[stable(feature = "grandfathered", since = "1.0.0")]
177+
#[stable(feature = "rust1", since = "1.0.0")]
178178
pub struct Rc<T> {
179179
// FIXME #12808: strange names to try to avoid interfering with field accesses of the contained
180180
// type via Deref
@@ -187,7 +187,7 @@ pub struct Rc<T> {
187187
///
188188
/// See the [module level documentation](../index.html) for more details.
189189
#[unsafe_no_drop_flag]
190-
#[stable(feature = "grandfathered", since = "1.0.0")]
190+
#[stable(feature = "rust1", since = "1.0.0")]
191191
#[cfg(not(stage0))] // NOTE remove cfg after next snapshot
192192
pub struct Rc<T> {
193193
// FIXME #12808: strange names to try to avoid interfering with field accesses of the contained
@@ -212,7 +212,7 @@ impl<T> Rc<T> {
212212
/// let five = Rc::new(5i);
213213
/// ```
214214
#[cfg(stage0)] // NOTE remove after next snapshot
215-
#[stable(feature = "grandfathered", since = "1.0.0")]
215+
#[stable(feature = "rust1", since = "1.0.0")]
216216
pub fn new(value: T) -> Rc<T> {
217217
unsafe {
218218
Rc {
@@ -239,7 +239,7 @@ impl<T> Rc<T> {
239239
///
240240
/// let five = Rc::new(5i);
241241
/// ```
242-
#[stable(feature = "grandfathered", since = "1.0.0")]
242+
#[stable(feature = "rust1", since = "1.0.0")]
243243
#[cfg(not(stage0))] // NOTE remove cfg after next snapshot
244244
pub fn new(value: T) -> Rc<T> {
245245
unsafe {
@@ -424,7 +424,7 @@ impl<T> BorrowFrom<Rc<T>> for T {
424424
}
425425
}
426426

427-
#[stable(feature = "grandfathered", since = "1.0.0")]
427+
#[stable(feature = "rust1", since = "1.0.0")]
428428
impl<T> Deref for Rc<T> {
429429
type Target = T;
430430

@@ -435,7 +435,7 @@ impl<T> Deref for Rc<T> {
435435
}
436436

437437
#[unsafe_destructor]
438-
#[stable(feature = "grandfathered", since = "1.0.0")]
438+
#[stable(feature = "rust1", since = "1.0.0")]
439439
impl<T> Drop for Rc<T> {
440440
/// Drops the `Rc<T>`.
441441
///
@@ -483,7 +483,7 @@ impl<T> Drop for Rc<T> {
483483
}
484484
}
485485

486-
#[stable(feature = "grandfathered", since = "1.0.0")]
486+
#[stable(feature = "rust1", since = "1.0.0")]
487487
impl<T> Clone for Rc<T> {
488488
/// Makes a clone of the `Rc<T>`.
489489
///
@@ -526,7 +526,7 @@ impl<T> Clone for Rc<T> {
526526
}
527527
}
528528

529-
#[stable(feature = "grandfathered", since = "1.0.0")]
529+
#[stable(feature = "rust1", since = "1.0.0")]
530530
impl<T: Default> Default for Rc<T> {
531531
/// Creates a new `Rc<T>`, with the `Default` value for `T`.
532532
///
@@ -539,13 +539,13 @@ impl<T: Default> Default for Rc<T> {
539539
/// let x: Rc<int> = Default::default();
540540
/// ```
541541
#[inline]
542-
#[stable(feature = "grandfathered", since = "1.0.0")]
542+
#[stable(feature = "rust1", since = "1.0.0")]
543543
fn default() -> Rc<T> {
544544
Rc::new(Default::default())
545545
}
546546
}
547547

548-
#[stable(feature = "grandfathered", since = "1.0.0")]
548+
#[stable(feature = "rust1", since = "1.0.0")]
549549
impl<T: PartialEq> PartialEq for Rc<T> {
550550
/// Equality for two `Rc<T>`s.
551551
///
@@ -580,10 +580,10 @@ impl<T: PartialEq> PartialEq for Rc<T> {
580580
fn ne(&self, other: &Rc<T>) -> bool { **self != **other }
581581
}
582582

583-
#[stable(feature = "grandfathered", since = "1.0.0")]
583+
#[stable(feature = "rust1", since = "1.0.0")]
584584
impl<T: Eq> Eq for Rc<T> {}
585585

586-
#[stable(feature = "grandfathered", since = "1.0.0")]
586+
#[stable(feature = "rust1", since = "1.0.0")]
587587
impl<T: PartialOrd> PartialOrd for Rc<T> {
588588
/// Partial comparison for two `Rc<T>`s.
589589
///
@@ -668,7 +668,7 @@ impl<T: PartialOrd> PartialOrd for Rc<T> {
668668
fn ge(&self, other: &Rc<T>) -> bool { **self >= **other }
669669
}
670670

671-
#[stable(feature = "grandfathered", since = "1.0.0")]
671+
#[stable(feature = "rust1", since = "1.0.0")]
672672
impl<T: Ord> Ord for Rc<T> {
673673
/// Comparison for two `Rc<T>`s.
674674
///
@@ -702,7 +702,7 @@ impl<T: fmt::Show> fmt::Show for Rc<T> {
702702
}
703703
}
704704

705-
#[stable(feature = "grandfathered", since = "1.0.0")]
705+
#[stable(feature = "rust1", since = "1.0.0")]
706706
impl<T: fmt::String> fmt::String for Rc<T> {
707707
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
708708
fmt::String::fmt(&**self, f)
@@ -807,7 +807,7 @@ impl<T> Weak<T> {
807807
}
808808

809809
#[unsafe_destructor]
810-
#[stable(feature = "grandfathered", since = "1.0.0")]
810+
#[stable(feature = "rust1", since = "1.0.0")]
811811
impl<T> Drop for Weak<T> {
812812
/// Drops the `Weak<T>`.
813813
///

0 commit comments

Comments
 (0)