Skip to content

Commit fccf5a0

Browse files
committed
Register new snapshots
1 parent 94a9506 commit fccf5a0

Some content is hidden

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

56 files changed

+993
-3964
lines changed

src/liballoc/boxed.rs

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ impl BoxAny for Box<Any> {
264264
}
265265
}
266266

267-
#[cfg(not(stage0))]
268267
#[stable(feature = "rust1", since = "1.0.0")]
269268
impl BoxAny for Box<Any+Send> {
270269
#[inline]

src/liballoc/heap.rs

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

11-
#[cfg(stage0)]
12-
#[cfg(not(test))]
13-
use core::ptr::PtrExt;
14-
1511
// FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias`
1612

1713
/// Return a pointer to `size` bytes of memory aligned to `align`.

src/liballoc/rc.rs

-3
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ use core::nonzero::NonZero;
159159
use core::ops::{Deref, Drop};
160160
use core::option::Option;
161161
use core::option::Option::{Some, None};
162-
#[cfg(stage0)]
163-
use core::ptr::{self, PtrExt};
164-
#[cfg(not(stage0))]
165162
use core::ptr;
166163
use core::result::Result;
167164
use core::result::Result::{Ok, Err};

src/libarena/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,8 @@ extern crate alloc;
4343
use std::cell::{Cell, RefCell};
4444
use std::cmp;
4545
use std::intrinsics;
46-
#[cfg(stage0)] // SNAP 270a677
47-
use std::intrinsics::{get_tydesc, TyDesc};
4846
use std::marker;
4947
use std::mem;
50-
#[cfg(stage0)]
51-
use std::num::{Int, UnsignedInt};
5248
use std::ptr;
5349
use std::rc::Rc;
5450
use std::rt::heap::{allocate, deallocate};
@@ -190,14 +186,12 @@ fn un_bitpack_tydesc_ptr(p: usize) -> (*const TyDesc, bool) {
190186
// HACK(eddyb) TyDesc replacement using a trait object vtable.
191187
// This could be replaced in the future with a custom DST layout,
192188
// or `&'static (drop_glue, size, align)` created by a `const fn`.
193-
#[cfg(not(stage0))] // SNAP 270a677
194189
struct TyDesc {
195190
drop_glue: fn(*const i8),
196191
size: usize,
197192
align: usize
198193
}
199194

200-
#[cfg(not(stage0))] // SNAP 270a677
201195
unsafe fn get_tydesc<T>() -> *const TyDesc {
202196
use std::raw::TraitObject;
203197

src/libcollections/btree/node.rs

-3
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ struct MutNodeSlice<'a, K: 'a, V: 'a> {
105105
/// Fails if `target_alignment` is not a power of two.
106106
#[inline]
107107
fn round_up_to_next(unrounded: usize, target_alignment: usize) -> usize {
108-
#[cfg(stage0)]
109-
use core::num::UnsignedInt;
110-
111108
assert!(target_alignment.is_power_of_two());
112109
(unrounded + target_alignment - 1) & !(target_alignment - 1)
113110
}

src/libcollections/macros.rs

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

11-
#[cfg(stage0)]
12-
/// Creates a `Vec` containing the arguments.
13-
///
14-
/// `vec!` allows `Vec`s to be defined with the same syntax as array expressions.
15-
/// There are two forms of this macro:
16-
///
17-
/// - Create a `Vec` containing a given list of elements:
18-
///
19-
/// ```
20-
/// let v = vec![1, 2, 3];
21-
/// assert_eq!(v[0], 1);
22-
/// assert_eq!(v[1], 2);
23-
/// assert_eq!(v[2], 3);
24-
/// ```
25-
///
26-
/// - Create a `Vec` from a given element and size:
27-
///
28-
/// ```
29-
/// let v = vec![1; 3];
30-
/// assert_eq!(v, [1, 1, 1]);
31-
/// ```
32-
///
33-
/// Note that unlike array expressions this syntax supports all elements
34-
/// which implement `Clone` and the number of elements doesn't have to be
35-
/// a constant.
36-
#[macro_export]
37-
#[stable(feature = "rust1", since = "1.0.0")]
38-
macro_rules! vec {
39-
($elem:expr; $n:expr) => (
40-
$crate::vec::from_elem($elem, $n)
41-
);
42-
($($x:expr),*) => (
43-
<[_] as $crate::slice::SliceExt>::into_vec(
44-
$crate::boxed::Box::new([$($x),*]))
45-
);
46-
($($x:expr,)*) => (vec![$($x),*])
47-
}
48-
49-
#[cfg(not(stage0))]
5011
/// Creates a `Vec` containing the arguments.
5112
///
5213
/// `vec!` allows `Vec`s to be defined with the same syntax as array expressions.
@@ -84,11 +45,10 @@ macro_rules! vec {
8445
($($x:expr,)*) => (vec![$($x),*])
8546
}
8647

87-
// HACK(japaric): with cfg(test) the inherent `[T]::into_vec` method, which is required for this
88-
// macro definition, is not available. Instead use the `slice::into_vec` function which is only
89-
// available with cfg(test)
48+
// HACK(japaric): with cfg(test) the inherent `[T]::into_vec` method, which is
49+
// required for this macro definition, is not available. Instead use the
50+
// `slice::into_vec` function which is only available with cfg(test)
9051
// NB see the slice::hack module in slice.rs for more information
91-
#[cfg(not(stage0))]
9252
#[cfg(test)]
9353
macro_rules! vec {
9454
($elem:expr; $n:expr) => (

0 commit comments

Comments
 (0)