Skip to content

Commit acc5e32

Browse files
committed
Register new snapshots
1 parent 4252a24 commit acc5e32

File tree

18 files changed

+23
-94
lines changed

18 files changed

+23
-94
lines changed

Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ endif
134134
# static copies of libstd and libextra. We also generate dynamic versions of all
135135
# libraries, so in the interest of space, prefer dynamic linking throughout the
136136
# compilation process.
137+
RUSTFLAGS_STAGE0 += -Z prefer-dynamic
137138
RUSTFLAGS_STAGE1 += -Z prefer-dynamic
138139
RUSTFLAGS_STAGE2 += -Z prefer-dynamic
139140
RUSTFLAGS_STAGE3 += -Z prefer-dynamic

src/libextra/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ Rust extras are part of the standard Rust distribution.
3232

3333
#[comment = "Rust extras"];
3434
#[license = "MIT/ASL2"];
35-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
3635
#[crate_type = "rlib"];
3736
#[crate_type = "dylib"];
3837

3938
#[feature(macro_rules, globs, managed_boxes)];
4039

4140
#[deny(non_camel_case_types)];
4241
#[deny(missing_doc)];
43-
#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
4442

4543
use std::str::{StrSlice, OwnedStr};
4644

src/libextra/unicode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub mod icu {
161161
use unicode::icu::*;
162162

163163
// #[link_name = "icuuc"]
164-
#[link_args = "-licuuc"]
164+
#[link(name = "icuuc")]
165165
extern {
166166
pub fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
167167
pub fn u_isdigit(c: UChar32) -> UBool;

src/librustc/front/feature_gate.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ impl Visitor<()> for Context {
113113

114114
fn visit_item(&mut self, i: @ast::item, _:()) {
115115
for attr in i.attrs.iter() {
116-
if "thread_local" == attr.name() &&
117-
cfg!(stage0, remove_this_on_next_snapshot) { // NOTE: snap rem
116+
if "thread_local" == attr.name() {
118117
self.gate_feature("thread_local", i.span,
119118
"`#[thread_local]` is an experimental feature, and does not \
120119
currently handle destructors. There is no corresponding \
@@ -136,8 +135,7 @@ impl Visitor<()> for Context {
136135
}
137136

138137
ast::item_foreign_mod(..) => {
139-
if attr::contains_name(i.attrs, "link_args") &&
140-
cfg!(stage0, remove_this_on_next_snapshot) { // NOTE: snap
138+
if attr::contains_name(i.attrs, "link_args") {
141139
self.gate_feature("link_args", i.span,
142140
"the `link_args` attribute is not portable \
143141
across platforms, it is recommended to \

src/librustc/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
#[comment = "The Rust compiler"];
1818
#[license = "MIT/ASL2"];
19-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
2019
#[crate_type = "dylib"];
2120

2221
#[feature(macro_rules, globs, struct_variant, managed_boxes)];
23-
#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
2422

2523
extern mod extra;
2624
extern mod syntax;

src/librustc/lib/llvm.rs

-6
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,7 @@ pub mod llvm {
306306
use std::libc::{c_char, c_int, c_longlong, c_ushort, c_uint, c_ulonglong,
307307
size_t};
308308

309-
#[cfg(stage0)]
310-
#[link_args = "-lrustllvm"]
311-
extern {}
312-
#[cfg(not(stage0))] // if you're deleting this, put this on the block below
313309
#[link(name = "rustllvm")]
314-
extern {}
315-
316310
extern {
317311
/* Create and destroy contexts. */
318312
pub fn LLVMContextCreate() -> ContextRef;

src/librustdoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#[desc = "rustdoc, the Rust documentation extractor"];
1818
#[license = "MIT/ASL2"];
19-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
2019
#[crate_type = "dylib"];
2120

2221
#[feature(globs, struct_variant, managed_boxes)];

src/librustpkg/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
1818

1919
#[license = "MIT/ASL2"];
20-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
2120
#[crate_type = "dylib"];
2221

2322
#[feature(globs, managed_boxes)];

src/librustuv/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ via `close` and `delete` methods.
4141
url = "https://github.com/mozilla/rust/tree/master/src/librustuv")];
4242

4343
#[license = "MIT/ASL2"];
44-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
4544
#[crate_type = "rlib"];
4645
#[crate_type = "dylib"];
4746

4847
#[feature(macro_rules, globs)];
49-
#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
5048

5149
use std::cast::transmute;
5250
use std::cast;

src/librustuv/uvll.rs

+7-18
Original file line numberDiff line numberDiff line change
@@ -524,15 +524,11 @@ pub unsafe fn guess_handle(handle: c_int) -> c_int {
524524
// second copies of everything. We obviously don't want this, so instead of
525525
// dying horribly during testing, we allow all of the test rustuv's references
526526
// to get resolved to the original rustuv crate.
527-
#[cfg(not(test), not(stage0))]
527+
#[cfg(not(test))]
528528
#[link(name = "uv_support", kind = "static")]
529529
#[link(name = "uv", kind = "static")]
530530
extern {}
531531

532-
#[cfg(not(test), stage0)]
533-
#[link_args = "-luv -luv_support"]
534-
extern {}
535-
536532
extern {
537533
fn rust_uv_loop_new() -> *c_void;
538534

@@ -722,26 +718,19 @@ extern {
722718
pub fn uv_signal_stop(handle: *uv_signal_t) -> c_int;
723719
}
724720

725-
// various platform libraries required by libuv
726-
#[cfg(not(stage0), not(target_os = "android"))]
721+
// libuv requires other native libraries on various platforms. These are all
722+
// listed here (for each platform)
723+
724+
#[cfg(not(target_os = "android"))] // apparently pthreads isn't on android?
727725
#[link(name = "pthread")]
728726
extern {}
729-
#[cfg(stage0)]
730-
#[link_args = "-lpthread"]
731-
extern {}
732727

733-
#[cfg(target_os = "win32", not(stage0))]
728+
#[cfg(target_os = "win32")]
734729
#[link(name = "ws2_32")]
735730
#[link(name = "psapi")]
736731
#[link(name = "iphlpapi")]
737732
extern {}
738-
#[cfg(target_os = "win32", stage0)]
739-
#[link_args = "-lws2_32 -lpsapi -liphlpapi"]
740-
extern {}
741733

742-
#[cfg(target_os = "freebsd", not(stage0))]
734+
#[cfg(target_os = "freebsd")]
743735
#[link(name = "kvm")]
744736
extern {}
745-
#[cfg(target_os = "freebsd", stage0)]
746-
#[link_args = "-lkvm"]
747-
extern {}

src/libstd/any.rs

-39
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,12 @@
1212
//! of any type.
1313
1414
use cast::transmute;
15-
#[cfg(stage0)]
16-
use cmp::Eq;
1715
use option::{Option, Some, None};
18-
#[cfg(stage0)]
19-
use to_bytes::{IterBytes, Cb};
2016
use to_str::ToStr;
2117
use unstable::intrinsics;
2218
use util::Void;
23-
#[cfg(not(stage0))]
2419
use unstable::intrinsics::TypeId;
2520

26-
///////////////////////////////////////////////////////////////////////////////
27-
// TypeId
28-
///////////////////////////////////////////////////////////////////////////////
29-
30-
/// `TypeId` represents a globally unique identifier for a type
31-
#[cfg(stage0)]
32-
pub struct TypeId {
33-
priv t: u64,
34-
}
35-
36-
#[cfg(stage0)]
37-
impl TypeId {
38-
/// Returns the `TypeId` of the type this generic function has been instantiated with
39-
#[inline]
40-
pub fn of<T: 'static>() -> TypeId {
41-
TypeId{ t: unsafe { intrinsics::type_id::<T>() } }
42-
}
43-
}
44-
45-
#[cfg(stage0)]
46-
impl Eq for TypeId {
47-
#[inline]
48-
fn eq(&self, &other: &TypeId) -> bool {
49-
self.t == other.t
50-
}
51-
}
52-
53-
#[cfg(stage0)]
54-
impl IterBytes for TypeId {
55-
fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool {
56-
self.t.iter_bytes(lsb0, f)
57-
}
58-
}
59-
6021
///////////////////////////////////////////////////////////////////////////////
6122
// Any trait
6223
///////////////////////////////////////////////////////////////////////////////

src/libstd/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,20 @@
5151

5252
#[comment = "The Rust standard library"];
5353
#[license = "MIT/ASL2"];
54-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
5554
#[crate_type = "rlib"];
5655
#[crate_type = "dylib"];
5756

5857
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
5958
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
6059
html_root_url = "http://static.rust-lang.org/doc/master")];
6160

62-
#[feature(macro_rules, globs, asm, managed_boxes, thread_local)];
61+
#[feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args)];
6362

6463
// Don't link to std. We are std.
6564
#[no_std];
6665

6766
#[deny(non_camel_case_types)];
6867
#[deny(missing_doc)];
69-
#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
7068

7169
// When testing libstd, bring in libuv as the I/O backend so tests can print
7270
// things and all of the std::io tests have an I/O interface to run on top

src/libstd/rt/mod.rs

-5
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ mod kill;
117117
/// The coroutine task scheduler, built on the `io` event loop.
118118
pub mod sched;
119119

120-
#[cfg(stage0)]
121-
pub mod io {
122-
pub use io::stdio;
123-
}
124-
125120
/// The EventLoop and internal synchronous I/O interface.
126121
pub mod rtio;
127122

src/libstd/rtdeps.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
//! This module contains the linkage attributes to all runtime dependencies of
12-
//! the stndard library This varies per-platform, but these libraries are
12+
//! the standard library This varies per-platform, but these libraries are
1313
//! necessary for running libstd.
1414
1515
// All platforms need to link to rustrt
@@ -48,7 +48,3 @@ extern {}
4848
#[link(name = "pthread")]
4949
#[link(name = "stdc++")]
5050
extern {}
51-
52-
#[cfg(stage0)]
53-
#[link_args = "-lstdc++"]
54-
extern {}

src/libstd/unstable/intrinsics.rs

-4
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,6 @@ extern "rust-intrinsic" {
313313
/// Gets an identifier which is globally unique to the specified type. This
314314
/// function will return the same value for a type regardless of whichever
315315
/// crate it is invoked in.
316-
#[cfg(stage0)]
317-
pub fn type_id<T: 'static>() -> u64;
318-
#[cfg(not(stage0))]
319316
pub fn type_id<T: 'static>() -> TypeId;
320317

321318

@@ -504,7 +501,6 @@ pub struct TypeId {
504501
#[cfg(not(test))]
505502
impl TypeId {
506503
/// Returns the `TypeId` of the type this generic function has been instantiated with
507-
#[cfg(not(stage0))]
508504
pub fn of<T: 'static>() -> TypeId {
509505
unsafe { type_id::<T>() }
510506
}

src/libsyntax/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
2020

2121
#[license = "MIT/ASL2"];
22-
#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
2322
#[crate_type = "dylib"];
2423

2524
#[feature(macro_rules, globs, managed_boxes)];

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-11-30 4252a24
2+
freebsd-x86_64 2e0bfc6eb0dd75b8a1ad5c9958d90f3b626650dd
3+
linux-i386 2ea4b43fbc22c295e60874ef494dfbea1cc08a63
4+
linux-x86_64 757a935bfce41fdacd9429c37d2ebd9b98baee17
5+
macos-i386 d64f14ba746c21bd5d52deb26e79f74b219b8d3c
6+
macos-x86_64 bc669acd847cfcdccc78f01c8dd4bfa47933b56a
7+
winnt-i386 d5e37b109c58a8b9b60bc2e79149c15d3a399eba
8+
19
S 2013-11-28 859c3ba
210
freebsd-x86_64 4110bb67408e382623b6c55e997e2c34342dc98d
311
linux-i386 072e638a6a11f7d00cf2c7b487162d0d2e3b5036

src/test/compile-fail/nolink-with-link-args.rs

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
So we try to compile with junk link_args and make sure they are visible in
1515
the compiler output. */
1616

17+
#[feature(link_args)];
18+
1719
#[link_args = "aFdEfSeVEEE"]
1820
#[nolink]
1921
extern {}

0 commit comments

Comments
 (0)