Skip to content

Commit fb2adf1

Browse files
committed
---
yaml --- r: 195703 b: refs/heads/auto c: 94137a3 h: refs/heads/master i: 195701: 50a3224 195699: 2d0c2ca 195695: defb8ab v: v3
1 parent b949d36 commit fb2adf1

File tree

14 files changed

+35
-43
lines changed

14 files changed

+35
-43
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: e3f2d45cb38a89172c423aba07ce270b1a04984f
13+
refs/heads/auto: 94137a37e90f2fc5faf725965b419944e14ad271
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/slice.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ use core::iter::MultiplicativeIterator;
8989
use core::marker::Sized;
9090
use core::mem::size_of;
9191
use core::mem;
92-
#[cfg(stage0)]
93-
use core::num::wrapping::WrappingOps;
9492
use core::ops::FnMut;
9593
use core::option::Option::{self, Some, None};
9694
use core::ptr;

branches/auto/src/libcollections/vec_deque.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ use core::default::Default;
2525
use core::fmt;
2626
use core::iter::{self, repeat, FromIterator, IntoIterator, RandomAccessIterator};
2727
use core::mem;
28-
#[cfg(stage0)]
29-
use core::num::wrapping::WrappingOps;
3028
use core::ops::{Index, IndexMut};
3129
use core::ptr::{self, Unique};
3230
use core::slice;

branches/auto/src/libcollectionstest/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#![feature(unicode)]
2222
#![feature(unsafe_destructor)]
2323
#![feature(into_cow)]
24+
#![feature(convert)]
2425
#![cfg_attr(test, feature(str_char))]
2526

2627
#[macro_use] extern crate log;

branches/auto/src/libcore/intrinsics.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ extern "rust-intrinsic" {
197197
/// Rust moves to non-zeroing dynamic drop (and thus removes the
198198
/// embedded drop flags that are being established by this
199199
/// intrinsic).
200-
#[cfg(not(stage0))]
201200
pub fn init_dropped<T>() -> T;
202201

203202
/// Create a value initialized to zero.

branches/auto/src/libcore/marker.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,5 @@ pub struct InvariantType<T>;
487487
pub trait Reflect : MarkerTrait {
488488
}
489489

490-
#[cfg(stage0)]
491-
impl<T> Reflect for T { }
492-
493-
#[cfg(not(stage0))]
494490
impl Reflect for .. { }
495491

branches/auto/src/libcore/mem.rs

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@ pub unsafe fn zeroed<T>() -> T {
173173
#[inline]
174174
#[unstable(feature = "filling_drop")]
175175
pub unsafe fn dropped<T>() -> T {
176-
#[cfg(stage0)]
177-
#[inline(always)]
178-
unsafe fn dropped_impl<T>() -> T { zeroed() }
179-
180-
#[cfg(not(stage0))]
181176
#[inline(always)]
182177
unsafe fn dropped_impl<T>() -> T { intrinsics::init_dropped() }
183178

@@ -337,38 +332,32 @@ macro_rules! repeat_u8_as_u64 {
337332
// But having the sign bit set is a pain, so 0x1d is probably better.
338333
//
339334
// And of course, 0x00 brings back the old world of zero'ing on drop.
340-
#[cfg(not(stage0))] #[unstable(feature = "filling_drop")]
335+
#[unstable(feature = "filling_drop")]
341336
pub const POST_DROP_U8: u8 = 0x1d;
342-
#[cfg(not(stage0))] #[unstable(feature = "filling_drop")]
337+
#[unstable(feature = "filling_drop")]
343338
pub const POST_DROP_U32: u32 = repeat_u8_as_u32!(POST_DROP_U8);
344-
#[cfg(not(stage0))] #[unstable(feature = "filling_drop")]
339+
#[unstable(feature = "filling_drop")]
345340
pub const POST_DROP_U64: u64 = repeat_u8_as_u64!(POST_DROP_U8);
346341

347342
#[cfg(target_pointer_width = "32")]
348-
#[cfg(not(stage0))] #[unstable(feature = "filling_drop")]
343+
#[unstable(feature = "filling_drop")]
349344
pub const POST_DROP_USIZE: usize = POST_DROP_U32 as usize;
350345
#[cfg(target_pointer_width = "64")]
351-
#[cfg(not(stage0))] #[unstable(feature = "filling_drop")]
346+
#[unstable(feature = "filling_drop")]
352347
pub const POST_DROP_USIZE: usize = POST_DROP_U64 as usize;
353348

354-
#[cfg(stage0)] #[unstable(feature = "filling_drop")]
355-
pub const POST_DROP_U8: u8 = 0;
356-
#[cfg(stage0)] #[unstable(feature = "filling_drop")]
357-
pub const POST_DROP_U32: u32 = 0;
358-
#[cfg(stage0)] #[unstable(feature = "filling_drop")]
359-
pub const POST_DROP_U64: u64 = 0;
360-
#[cfg(stage0)] #[unstable(feature = "filling_drop")]
361-
pub const POST_DROP_USIZE: usize = 0;
362-
363-
/// Interprets `src` as `&U`, and then reads `src` without moving the contained value.
364-
///
365-
/// This function will unsafely assume the pointer `src` is valid for `sizeof(U)` bytes by
366-
/// transmuting `&T` to `&U` and then reading the `&U`. It will also unsafely create a copy of the
367-
/// contained value instead of moving out of `src`.
368-
///
369-
/// It is not a compile-time error if `T` and `U` have different sizes, but it is highly encouraged
370-
/// to only invoke this function where `T` and `U` have the same size. This function triggers
371-
/// undefined behavior if `U` is larger than `T`.
349+
/// Interprets `src` as `&U`, and then reads `src` without moving the contained
350+
/// value.
351+
///
352+
/// This function will unsafely assume the pointer `src` is valid for
353+
/// `sizeof(U)` bytes by transmuting `&T` to `&U` and then reading the `&U`. It
354+
/// will also unsafely create a copy of the contained value instead of moving
355+
/// out of `src`.
356+
///
357+
/// It is not a compile-time error if `T` and `U` have different sizes, but it
358+
/// is highly encouraged to only invoke this function where `T` and `U` have the
359+
/// same size. This function triggers undefined behavior if `U` is larger than
360+
/// `T`.
372361
///
373362
/// # Examples
374363
///

branches/auto/src/librand/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ pub trait Rng : Sized {
154154
///
155155
/// let mut v = [0; 13579];
156156
/// thread_rng().fill_bytes(&mut v);
157-
/// println!("{:?}", v);
157+
/// println!("{:?}", &v[..]);
158158
/// ```
159159
fn fill_bytes(&mut self, dest: &mut [u8]) {
160160
// this could, in theory, be done by transmuting dest to a

branches/auto/src/librustc/middle/ty.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ use std::cmp;
7373
use std::fmt;
7474
use std::hash::{Hash, SipHasher, Hasher};
7575
use std::mem;
76+
use std::num::ToPrimitive;
7677
use std::ops;
7778
use std::rc::Rc;
7879
use std::vec::IntoIter;

branches/auto/src/libstd/old_io/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ mod test {
744744
wr.write(&[5; 10]).unwrap();
745745
}
746746
}
747-
assert_eq!(buf.as_ref(), [5; 100].as_ref());
747+
assert_eq!(&buf[..], &[5; 100][..]);
748748
});
749749
}
750750

branches/auto/src/libstd/old_io/net/ip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ pub struct ParseError;
414414
/// Some examples:
415415
///
416416
/// ```rust,no_run
417-
/// # #![feature(old_io, core)]
417+
/// # #![feature(old_io, core, convert)]
418418
/// # #![allow(unused_must_use)]
419419
///
420420
/// use std::old_io::{TcpStream, TcpListener};

branches/auto/src/libstd/old_io/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ impl Command {
367367
/// # Examples
368368
///
369369
/// ```
370-
/// # #![feature(old_io, core)]
370+
/// # #![feature(old_io, core, convert)]
371371
/// use std::old_io::Command;
372372
///
373373
/// let output = match Command::new("cat").arg("foot.txt").output() {

branches/auto/src/libsyntax/feature_gate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[
9292
("main", "1.0.0", Active),
9393

9494
// Deprecate after snapshot
95-
// SNAP a923278
95+
// SNAP 5520801
9696
("unsafe_destructor", "1.0.0", Active),
9797

9898
// A temporary feature gate used to enable parser extensions needed

branches/auto/src/snapshots.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
S 2015-03-27 5520801
2+
bitrig-x86_64 41de2c7a69a1ac648d3fa3b65e96a29bdc122163
3+
freebsd-x86_64 0910bbad35e213f679d0433884fd51398eb3bc8d
4+
linux-i386 1ef82402ed16f5a6d2f87a9a62eaa83170e249ec
5+
linux-x86_64 ef2154372e97a3cb687897d027fd51c8f2c5f349
6+
macos-i386 0310b1a970f2da7e61770fd14dbbbdca3b518234
7+
macos-x86_64 5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa
8+
winnt-i386 808b7961f85872f04ec15ad0d3e9e23ae9bc0c3b
9+
winnt-x86_64 903a99a58f57a9bd9848cc68a2445dda881f1ee8
10+
111
S 2015-03-25 a923278
212
bitrig-x86_64 41de2c7a69a1ac648d3fa3b65e96a29bdc122163
313
freebsd-x86_64 cd02c86a9218da73b2a45aff293787010d33bf3e

0 commit comments

Comments
 (0)