Skip to content

Commit 898701c

Browse files
committed
auto merge of #15556 : alexcrichton/rust/snapshots, r=brson
Closes #15544
2 parents 1852069 + 0c71e0c commit 898701c

File tree

44 files changed

+13
-242
lines changed

Some content is hidden

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

44 files changed

+13
-242
lines changed

mk/target.mk

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,6 @@ $(foreach host,$(CFG_HOST), \
6868
# $(4) is the crate name
6969
define RUST_TARGET_STAGE_N
7070

71-
# NOTE: after a stage0 snap this should be just EXTRA_FILENAME, not with a stage
72-
# or target bound
73-
EXTRA_FILENAME_$(1)_$(2) = -C extra-filename=-$$(CFG_FILENAME_EXTRA)
74-
ifeq ($(1),0)
75-
ifeq ($$(CFG_BUILD),$(2))
76-
EXTRA_FILENAME_$(1)_$(2) =
77-
endif
78-
endif
79-
8071
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
8172
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
8273
$$(CRATEFILE_$(4)) \
@@ -95,7 +86,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
9586
-L "$$(dir $$(LLVM_STDCPP_LOCATION_$(2)))" \
9687
$$(RUSTFLAGS_$(4)) \
9788
--out-dir $$(@D) \
98-
$$(EXTRA_FILENAME_$(1)_$(2)) \
89+
-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
9990
$$<
10091
@touch $$@
10192
$$(call LIST_ALL_OLD_GLOB_MATCHES,\

src/liballoc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
//! by libc malloc/free. The `libc_heap` module is defined to be wired up to
6161
//! the system malloc/free.
6262
63-
#![crate_id = "alloc#0.11.0"] // NOTE: remove after a stage0 snap
6463
#![crate_name = "alloc"]
6564
#![experimental]
6665
#![license = "MIT/ASL2"]
@@ -71,7 +70,6 @@
7170

7271
#![no_std]
7372
#![feature(lang_items, phase, unsafe_destructor)]
74-
#![allow(unused_attribute)] // NOTE: remove after stage0
7573

7674
#[phase(plugin, link)]
7775
extern crate core;

src/libarena/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
//! arena but can only hold objects of a single type, and Arena, which is a
2020
//! more complex, slower Arena which can hold objects of any type.
2121
22-
#![crate_id = "arena#0.11.0"]
2322
#![crate_name = "arena"]
2423
#![experimental]
2524
#![crate_type = "rlib"]
@@ -31,7 +30,6 @@
3130

3231
#![feature(unsafe_destructor)]
3332
#![allow(missing_doc)]
34-
#![allow(unused_attribute)] // NOTE: remove after stage0
3533

3634
use std::cell::{Cell, RefCell};
3735
use std::cmp;

src/libcollections/bitv.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,16 @@ use core::cmp;
1616
use core::default::Default;
1717
use core::fmt;
1818
use core::iter::Take;
19+
use core::ops::Index;
1920
use core::slice;
2021
use core::uint;
2122
use std::hash;
2223

2324
use {Collection, Mutable, Set, MutableSet};
2425
use vec::Vec;
2526

26-
#[cfg(not(stage0))]
27-
use core::ops::Index;
2827

29-
#[cfg(not(stage0))]
3028
static TRUE: bool = true;
31-
32-
#[cfg(not(stage0))]
3329
static FALSE: bool = false;
3430

3531
#[deriving(Clone)]
@@ -80,7 +76,6 @@ pub struct Bitv {
8076
nbits: uint
8177
}
8278

83-
#[cfg(not(stage0))]
8479
impl Index<uint,bool> for Bitv {
8580
#[inline]
8681
fn index<'a>(&'a self, i: &uint) -> &'a bool {

src/libcollections/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* Collection types.
1313
*/
1414

15-
#![crate_id = "collections#0.11.0"] // NOTE: remove after stage0
1615
#![crate_name = "collections"]
1716
#![experimental]
1817
#![crate_type = "rlib"]
@@ -25,7 +24,6 @@
2524
#![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]
2625
#![feature(unsafe_destructor)]
2726
#![no_std]
28-
#![allow(unused_attribute)] // NOTE: remove after stage0
2927

3028
#[phase(plugin, link)] extern crate core;
3129
extern crate unicode;

src/libcore/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
// Since libcore defines many fundamental lang items, all tests live in a
4848
// separate crate, libcoretest, to avoid bizarre issues.
4949

50-
#![crate_id = "core#0.11.0"]
5150
#![crate_name = "core"]
5251
#![experimental]
5352
#![license = "MIT/ASL2"]
@@ -61,7 +60,6 @@
6160
#![feature(globs, intrinsics, lang_items, macro_rules, managed_boxes, phase)]
6261
#![feature(simd, unsafe_destructor)]
6362
#![deny(missing_doc)]
64-
#![allow(unused_attribute)] // NOTE: remove after stage0
6563

6664
mod macros;
6765

src/libcore/ops.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ shr_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64)
636636
* ```
637637
*/
638638
#[lang="index"]
639-
#[cfg(not(stage0))]
640639
pub trait Index<Index,Result> {
641640
/// The method for the indexing (`Foo[Bar]`) operation
642641
fn index<'a>(&'a self, index: &Index) -> &'a Result;
@@ -668,7 +667,6 @@ pub trait Index<Index,Result> {
668667
* ```
669668
*/
670669
#[lang="index_mut"]
671-
#[cfg(not(stage0))]
672670
pub trait IndexMut<Index,Result> {
673671
/// The method for the indexing (`Foo[Bar]`) operation
674672
fn index_mut<'a>(&'a mut self, index: &Index) -> &'a mut Result;

src/libcore/prelude.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
3434
pub use ops::{BitAnd, BitOr, BitXor};
3535
pub use ops::{Drop, Deref, DerefMut};
3636
pub use ops::{Shl, Shr};
37-
#[cfg(not(stage0))]
3837
pub use ops::{Index, IndexMut};
3938
pub use option::{Option, Some, None};
4039
pub use result::{Result, Ok, Err};

src/libdebug/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//! Additionally, it is not guaranteed that functionality such as reflection
1717
//! will persist into the future.
1818
19-
#![crate_id = "debug#0.11.0"] // NOTE: remove after stage0
2019
#![crate_name = "debug"]
2120
#![experimental]
2221
#![license = "MIT/ASL2"]
@@ -28,7 +27,6 @@
2827
#![experimental]
2928
#![feature(managed_boxes, macro_rules)]
3029
#![allow(experimental)]
31-
#![allow(unused_attribute)] // NOTE: remove after stage0
3230

3331
pub mod fmt;
3432
pub mod reflect;

src/libflate/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
1818
1919
*/
2020

21-
#![crate_id = "flate#0.11.0"] // NOTE: remove after stage0
2221
#![crate_name = "flate"]
2322
#![experimental]
2423
#![crate_type = "rlib"]
@@ -28,7 +27,6 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
2827
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2928
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
3029
#![feature(phase)]
31-
#![allow(unused_attribute)] // NOTE: remove after stage0
3230

3331
#[cfg(test)] #[phase(plugin, link)] extern crate log;
3432

src/libfmt_macros/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@
1414
//! Parsing does not happen at runtime: structures of `std::fmt::rt` are
1515
//! generated instead.
1616
17-
#![crate_id = "fmt_macros#0.11.0"] // NOTE: remove after stage0c
1817
#![crate_name = "fmt_macros"]
1918
#![experimental]
2019
#![license = "MIT/ASL2"]
2120
#![crate_type = "rlib"]
2221
#![crate_type = "dylib"]
2322
#![feature(macro_rules, globs)]
24-
#![allow(unused_attribute)] // NOTE: remove after stage0
2523

2624
use std::char;
2725
use std::str;

src/libfourcc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ fn main() {
3939
4040
*/
4141

42-
#![crate_id = "fourcc#0.11.0"] // NOTE: remove after stage0
4342
#![crate_name = "fourcc"]
4443
#![experimental]
4544
#![crate_type = "rlib"]
@@ -48,7 +47,6 @@ fn main() {
4847
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
4948
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5049
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
51-
#![allow(unused_attribute)] // NOTE: remove after stage0
5250

5351
#![feature(plugin_registrar, managed_boxes)]
5452

src/libgetopts/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
//! }
7777
//! ~~~
7878
79-
#![crate_id = "getopts#0.11.0"] // NOTE: remove after stage0
8079
#![crate_name = "getopts"]
8180
#![experimental]
8281
#![crate_type = "rlib"]
@@ -88,7 +87,6 @@
8887
html_playground_url = "http://play.rust-lang.org/")]
8988
#![feature(globs, phase)]
9089
#![deny(missing_doc)]
91-
#![allow(unused_attribute)] // NOTE: remove after stage0
9290

9391
#[cfg(test)] extern crate debug;
9492
#[cfg(test)] #[phase(plugin, link)] extern crate log;

src/libglob/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* `glob`/`fnmatch` functions.
2424
*/
2525

26-
#![crate_id = "glob#0.11.0"] // NOTE: remove after stage0
2726
#![crate_name = "glob"]
2827
#![experimental]
2928
#![crate_type = "rlib"]
@@ -33,7 +32,6 @@
3332
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
3433
html_root_url = "http://doc.rust-lang.org/0.11.0/",
3534
html_playground_url = "http://play.rust-lang.org/")]
36-
#![allow(unused_attribute)] // NOTE: remove after stage0
3735

3836
use std::cell::Cell;
3937
use std::{cmp, os, path};

src/libgraphviz/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ pub fn main() {
266266
267267
*/
268268

269-
#![crate_id = "graphviz#0.11.0"] // NOTE: remove after stage0
270269
#![crate_name = "graphviz"]
271270
#![experimental]
272271
#![crate_type = "rlib"]
@@ -275,7 +274,6 @@ pub fn main() {
275274
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
276275
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
277276
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
278-
#![allow(unused_attribute)] // NOTE: remove after stage0
279277

280278
use std::io;
281279
use std::str;

src/libgreen/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
//! pool.shutdown();
198198
//! ```
199199
200-
#![crate_id = "green#0.11.0"] // NOTE: remove after stage0
201200
#![crate_name = "green"]
202201
#![experimental]
203202
#![license = "MIT/ASL2"]
@@ -211,7 +210,6 @@
211210
// NB this does *not* include globs, please keep it that way.
212211
#![feature(macro_rules, phase, default_type_params)]
213212
#![allow(visible_private_types, deprecated)]
214-
#![allow(unused_attribute)] // NOTE: remove after stage0
215213

216214
#[cfg(test)] #[phase(plugin, link)] extern crate log;
217215
#[cfg(test)] extern crate rustuv;

src/libhexfloat/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ fn main() {
3636
3737
*/
3838

39-
#![crate_id = "hexfloat#0.11.0"] // NOTE: remove after stage0
4039
#![crate_name = "hexfloat"]
4140
#![experimental]
4241
#![crate_type = "rlib"]
@@ -46,7 +45,6 @@ fn main() {
4645
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
4746
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
4847
#![feature(plugin_registrar, managed_boxes)]
49-
#![allow(unused_attribute)] // NOTE: remove after stage0
5048

5149
extern crate syntax;
5250
extern crate rustc;

src/liblibc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![feature(globs)]
12-
#![crate_id = "libc#0.11.0"] // NOTE: remove after a stage0 snap
1312
#![crate_name = "libc"]
1413
#![experimental]
1514
#![no_std] // we don't need std, and we can't have std, since it doesn't exist
@@ -19,7 +18,6 @@
1918
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2019
html_root_url = "http://doc.rust-lang.org/0.11.0/",
2120
html_playground_url = "http://play.rust-lang.org/")]
22-
#![allow(unused_attribute)] // NOTE: remove after stage0
2321

2422
/*!
2523
* Bindings for the C standard library and other platform libraries

src/liblog/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ if logging is disabled, none of the components of the log will be executed.
105105
106106
*/
107107

108-
#![crate_id = "log#0.11.0"] // NOTE: Remove after stage0
109108
#![crate_name = "log"]
110109
#![experimental]
111110
#![license = "MIT/ASL2"]
@@ -115,7 +114,6 @@ if logging is disabled, none of the components of the log will be executed.
115114
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
116115
html_root_url = "http://doc.rust-lang.org/0.11.0/",
117116
html_playground_url = "http://play.rust-lang.org/")]
118-
#![allow(unused_attribute)] // NOTE: remove after stage0
119117
#![feature(macro_rules)]
120118
#![deny(missing_doc)]
121119

src/libnative/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
//! }
4747
//! ```
4848
49-
#![crate_id = "native#0.11.0"] // NOTE: remove after stage0
5049
#![crate_name = "native"]
5150
#![experimental]
5251
#![license = "MIT/ASL2"]
@@ -58,7 +57,6 @@
5857

5958
#![deny(unused_result, unused_must_use)]
6059
#![allow(non_camel_case_types, deprecated)]
61-
#![allow(unused_attribute)] // NOTE: remove after stage0
6260
#![feature(default_type_params, lang_items)]
6361

6462
// NB this crate explicitly does *not* allow glob imports, please seriously

src/libnum/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
4545
#![feature(macro_rules)]
4646

47-
#![crate_id = "num#0.11.0"] // NOTE: remove after stage0
4847
#![crate_name = "num"]
4948
#![experimental]
5049
#![crate_type = "rlib"]
@@ -54,7 +53,6 @@
5453
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5554
html_root_url = "http://doc.rust-lang.org/0.11.0/",
5655
html_playground_url = "http://play.rust-lang.org/")]
57-
#![allow(unused_attribute)] // NOTE: remove after stage0
5856
#![allow(deprecated)] // from_str_radix
5957

6058
extern crate rand;

src/librand/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//! is not recommended to use this library directly, but rather the official
1717
//! interface through `std::rand`.
1818
19-
#![crate_id = "rand#0.11.0"] // NOTE: remove after a stage0 snap
2019
#![crate_name = "rand"]
2120
#![license = "MIT/ASL2"]
2221
#![crate_type = "rlib"]
@@ -26,7 +25,6 @@
2625
html_playground_url = "http://play.rust-lang.org/")]
2726

2827
#![feature(macro_rules, phase, globs)]
29-
#![allow(unused_attribute)] // NOTE: remove after stage0
3028
#![no_std]
3129
#![experimental]
3230

src/libregex/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
//! characters in the search text and `m` is the number of instructions in a
357357
//! compiled expression.
358358
359-
#![crate_id = "regex#0.11.0"] // NOTE: remove after stage0
360359
#![crate_name = "regex"]
361360
#![crate_type = "rlib"]
362361
#![crate_type = "dylib"]
@@ -368,7 +367,6 @@
368367
html_playground_url = "http://play.rust-lang.org/")]
369368

370369
#![feature(macro_rules, phase)]
371-
#![allow(unused_attribute)] // NOTE: remove after stage0
372370
#![deny(missing_doc)]
373371

374372
#[cfg(test)]

src/libregex_macros/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
//! This crate provides the `regex!` macro. Its use is documented in the
1212
//! `regex` crate.
1313
14-
#![crate_id = "regex_macros#0.11.0"] // NOTE: remove after stage0
1514
#![crate_name = "regex_macros"]
1615
#![crate_type = "dylib"]
1716
#![experimental]
1817
#![license = "MIT/ASL2"]
1918
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2019
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2120
html_root_url = "http://doc.rust-lang.org/0.11.0/")]
22-
#![allow(unused_attribute)] // NOTE: remove after stage0
2321

2422
#![feature(plugin_registrar, managed_boxes, quote)]
2523

0 commit comments

Comments
 (0)