Skip to content

Commit 33717a1

Browse files
author
Ilya Dmitrichenko
committed
---
yaml --- r: 124628 b: refs/heads/auto c: 3a5d28f h: refs/heads/master v: v3
1 parent 333e96d commit 33717a1

File tree

30 files changed

+134
-626
lines changed

30 files changed

+134
-626
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: f15d6d28396e8700b6c3f2704204a2769e710403
16+
refs/heads/auto: 3a5d28f3d1ea78250b1e1c32b4cb2727ab9ef03f
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ arguments we pass to functions and macros, if you're passing more than one.
583583
When you just use the double curly braces, Rust will attempt to display the
584584
value in a meaningful way by checking out its type. If you want to specify the
585585
format in a more detailed manner, there are a [wide number of options
586-
available](/std/fmt/index.html). For now, we'll just stick to the default:
586+
available](/std/fmt/index.html). Fow now, we'll just stick to the default:
587587
integers aren't very complicated to print.
588588

589589
So, we've cleared up all of the confusion around bindings, with one exception:

branches/auto/src/liballoc/rc.rs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ fn main() {
148148
149149
*/
150150

151-
#![stable]
152-
153151
use core::mem::transmute;
154152
use core::cell::Cell;
155153
use core::clone::Clone;
@@ -173,7 +171,6 @@ struct RcBox<T> {
173171

174172
/// Immutable reference counted pointer type
175173
#[unsafe_no_drop_flag]
176-
#[stable]
177174
pub struct Rc<T> {
178175
// FIXME #12808: strange names to try to avoid interfering with
179176
// field accesses of the contained type via Deref
@@ -182,7 +179,6 @@ pub struct Rc<T> {
182179
_noshare: marker::NoShare
183180
}
184181

185-
#[stable]
186182
impl<T> Rc<T> {
187183
/// Construct a new reference-counted box
188184
pub fn new(value: T) -> Rc<T> {
@@ -207,7 +203,6 @@ impl<T> Rc<T> {
207203

208204
impl<T> Rc<T> {
209205
/// Downgrade the reference-counted pointer to a weak reference
210-
#[experimental = "Weak pointers may not belong in this module."]
211206
pub fn downgrade(&self) -> Weak<T> {
212207
self.inc_weak();
213208
Weak {
@@ -243,7 +238,6 @@ impl<T: Clone> Rc<T> {
243238
}
244239
}
245240

246-
#[experimental = "Deref is experimental."]
247241
impl<T> Deref<T> for Rc<T> {
248242
/// Borrow the value contained in the reference-counted box
249243
#[inline(always)]
@@ -253,7 +247,6 @@ impl<T> Deref<T> for Rc<T> {
253247
}
254248

255249
#[unsafe_destructor]
256-
#[experimental = "Drop is experimental."]
257250
impl<T> Drop for Rc<T> {
258251
fn drop(&mut self) {
259252
unsafe {
@@ -276,7 +269,7 @@ impl<T> Drop for Rc<T> {
276269
}
277270
}
278271

279-
#[unstable = "Clone is unstable."]
272+
#[unstable]
280273
impl<T> Clone for Rc<T> {
281274
#[inline]
282275
fn clone(&self) -> Rc<T> {
@@ -285,26 +278,22 @@ impl<T> Clone for Rc<T> {
285278
}
286279
}
287280

288-
#[stable]
289281
impl<T: Default> Default for Rc<T> {
290282
#[inline]
291283
fn default() -> Rc<T> {
292284
Rc::new(Default::default())
293285
}
294286
}
295287

296-
#[unstable = "PartialEq is unstable."]
297288
impl<T: PartialEq> PartialEq for Rc<T> {
298289
#[inline(always)]
299290
fn eq(&self, other: &Rc<T>) -> bool { **self == **other }
300291
#[inline(always)]
301292
fn ne(&self, other: &Rc<T>) -> bool { **self != **other }
302293
}
303294

304-
#[unstable = "Eq is unstable."]
305295
impl<T: Eq> Eq for Rc<T> {}
306296

307-
#[unstable = "PartialOrd is unstable."]
308297
impl<T: PartialOrd> PartialOrd for Rc<T> {
309298
#[inline(always)]
310299
fn partial_cmp(&self, other: &Rc<T>) -> Option<Ordering> {
@@ -324,13 +313,11 @@ impl<T: PartialOrd> PartialOrd for Rc<T> {
324313
fn ge(&self, other: &Rc<T>) -> bool { **self >= **other }
325314
}
326315

327-
#[unstable = "Ord is unstable."]
328316
impl<T: Ord> Ord for Rc<T> {
329317
#[inline]
330318
fn cmp(&self, other: &Rc<T>) -> Ordering { (**self).cmp(&**other) }
331319
}
332320

333-
#[experimental = "Show is experimental."]
334321
impl<T: fmt::Show> fmt::Show for Rc<T> {
335322
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
336323
(**self).fmt(f)
@@ -339,7 +326,6 @@ impl<T: fmt::Show> fmt::Show for Rc<T> {
339326

340327
/// Weak reference to a reference-counted box
341328
#[unsafe_no_drop_flag]
342-
#[experimental = "Weak pointers may not belong in this module."]
343329
pub struct Weak<T> {
344330
// FIXME #12808: strange names to try to avoid interfering with
345331
// field accesses of the contained type via Deref
@@ -348,7 +334,6 @@ pub struct Weak<T> {
348334
_noshare: marker::NoShare
349335
}
350336

351-
#[experimental = "Weak pointers may not belong in this module."]
352337
impl<T> Weak<T> {
353338
/// Upgrade a weak reference to a strong reference
354339
pub fn upgrade(&self) -> Option<Rc<T>> {
@@ -362,7 +347,6 @@ impl<T> Weak<T> {
362347
}
363348

364349
#[unsafe_destructor]
365-
#[experimental = "Weak pointers may not belong in this module."]
366350
impl<T> Drop for Weak<T> {
367351
fn drop(&mut self) {
368352
unsafe {
@@ -380,7 +364,6 @@ impl<T> Drop for Weak<T> {
380364
}
381365

382366
#[unstable]
383-
#[experimental = "Weak pointers may not belong in this module."]
384367
impl<T> Clone for Weak<T> {
385368
#[inline]
386369
fn clone(&self) -> Weak<T> {

0 commit comments

Comments
 (0)