Skip to content

Commit d9a9037

Browse files
committed
---
yaml --- r: 104995 b: refs/heads/snap-stage3 c: 3c4edff h: refs/heads/master i: 104993: 6866d9d 104991: e010603 v: v3
1 parent 2d9035d commit d9a9037

File tree

244 files changed

+832
-856
lines changed

Some content is hidden

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

244 files changed

+832
-856
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 739f22f611869d82bc6b5525426ad721c9674040
4+
refs/heads/snap-stage3: 3c4edff9b58eb7dd689779fdab6f980f0860dd98
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ script: |
4141
fi &&
4242
make tidy &&
4343
make -j4 rustc-stage1 &&
44-
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
44+
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
4545
4646
env:
4747
global:

branches/snap-stage3/src/compiletest/compiletest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#[feature(phase)];
1313

1414
#[allow(non_camel_case_types)];
15-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
1615
#[deny(warnings)];
16+
#[allow(deprecated_owned_vector)];
1717

1818
extern crate test;
1919
extern crate getopts;

branches/snap-stage3/src/doc/guide-unsafe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,10 @@ Other features provided by lang items include:
595595
- stack unwinding and general failure; the `eh_personality`, `fail_`
596596
and `fail_bounds_checks` lang items.
597597
- the traits in `std::kinds` used to indicate types that satisfy
598-
various kinds; lang items `send`, `share` and `pod`.
598+
various kinds; lang items `send`, `freeze` and `pod`.
599599
- the marker types and variance indicators found in
600600
`std::kinds::markers`; lang items `covariant_type`,
601-
`contravariant_lifetime`, `no_share_bound`, etc.
601+
`contravariant_lifetime`, `no_freeze_bound`, etc.
602602

603603
Lang items are loaded lazily by the compiler; e.g. if one never uses
604604
`~` then there is no need to define functions for `exchange_malloc`

branches/snap-stage3/src/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ Supported traits for `deriving` are:
20332033

20342034
* Comparison traits: `Eq`, `TotalEq`, `Ord`, `TotalOrd`.
20352035
* Serialization: `Encodable`, `Decodable`. These require `serialize`.
2036-
* `Clone`, to create `T` from `&T` via a copy.
2036+
* `Clone` and `DeepClone`, to perform (deep) copies.
20372037
* `Hash`, to iterate over the bytes in a data type.
20382038
* `Rand`, to create a random instance of a data type.
20392039
* `Default`, to create an empty instance of a data type.

branches/snap-stage3/src/doc/tutorial.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,10 +2095,6 @@ and may not be overridden:
20952095
Types are sendable
20962096
unless they contain managed boxes, managed closures, or references.
20972097
2098-
* `Share` - Types that are *threadsafe*
2099-
These are types that are safe to be used across several threads with access to
2100-
a `&T` pointer. `MutexArc` is an example of a *sharable* type with internal mutable data.
2101-
21022098
* `Freeze` - Constant (immutable) types.
21032099
These are types that do not contain anything intrinsically mutable.
21042100
Intrinsically mutable values include `Cell` in the standard library.
@@ -2538,7 +2534,7 @@ enum ABC { A, B, C }
25382534
~~~
25392535

25402536
The full list of derivable traits is `Eq`, `TotalEq`, `Ord`,
2541-
`TotalOrd`, `Encodable` `Decodable`, `Clone`,
2537+
`TotalOrd`, `Encodable` `Decodable`, `Clone`, `DeepClone`,
25422538
`Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
25432539

25442540
# Crates and the module system

branches/snap-stage3/src/etc/generate-deriving-span-tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def write_file(name, string):
116116
}
117117

118118
for (trait, supers, errs) in [('Rand', [], 1),
119-
('Clone', [], 1),
119+
('Clone', [], 1), ('DeepClone', ['Clone'], 1),
120120
('Eq', [], 2), ('Ord', [], 8),
121121
('TotalEq', [], 1), ('TotalOrd', ['TotalEq'], 1),
122122
('Show', [], 1),

branches/snap-stage3/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt
7272
syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
7373
syn keyword rustTrait ToCStr
7474
syn keyword rustTrait Char
75-
syn keyword rustTrait Clone
75+
syn keyword rustTrait Clone DeepClone
7676
syn keyword rustTrait Eq Ord TotalEq TotalOrd Ordering Equiv
7777
syn keyword rustEnumVariant Less Equal Greater
7878
syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet

branches/snap-stage3/src/libarena/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
html_root_url = "http://static.rust-lang.org/doc/master")];
2525
#[allow(missing_doc)];
2626
#[feature(managed_boxes)];
27-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
27+
#[allow(deprecated_owned_vector)];
2828

2929
extern crate collections;
3030

branches/snap-stage3/src/libcollections/hashmap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ mod test_map {
15751575
use super::HashMap;
15761576
use std::iter::{Iterator,range_inclusive,range_step_inclusive};
15771577
use std::local_data;
1578-
use std::vec;
1578+
use std::vec_ng;
15791579

15801580
#[test]
15811581
fn test_create_capacity_zero() {
@@ -1599,7 +1599,7 @@ mod test_map {
15991599
assert_eq!(*m.find(&2).unwrap(), 4);
16001600
}
16011601

1602-
local_data_key!(drop_vector: vec::Vec<int>)
1602+
local_data_key!(drop_vector: vec_ng::Vec<int>)
16031603

16041604
#[deriving(Hash, Eq)]
16051605
struct Dropable {
@@ -1625,7 +1625,7 @@ mod test_map {
16251625

16261626
#[test]
16271627
fn test_drops() {
1628-
local_data::set(drop_vector, vec::Vec::from_elem(200, 0));
1628+
local_data::set(drop_vector, vec_ng::Vec::from_elem(200, 0));
16291629

16301630
{
16311631
let mut m = HashMap::new();

branches/snap-stage3/src/libcollections/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
html_root_url = "http://static.rust-lang.org/doc/master")];
2222

2323
#[feature(macro_rules, managed_boxes, default_type_params, phase)];
24-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
24+
25+
// NOTE remove the following two attributes after the next snapshot.
26+
#[allow(unrecognized_lint)];
27+
#[allow(default_type_param_usage)];
28+
#[allow(deprecated_owned_vector)];
2529

2630
extern crate rand;
2731

branches/snap-stage3/src/libflate/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ pub fn inflate_bytes_zlib(bytes: &[u8]) -> CVec<u8> {
9494

9595
#[cfg(test)]
9696
mod tests {
97+
#[allow(deprecated_owned_vector)];
9798
extern crate rand;
9899

99100
use super::{inflate_bytes, deflate_bytes};

branches/snap-stage3/src/libgetopts/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,10 @@
8383
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
8484
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
8585
html_root_url = "http://static.rust-lang.org/doc/master")];
86-
#[feature(globs, phase)];
8786
#[deny(missing_doc)];
88-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
87+
#[allow(deprecated_owned_vector)];
88+
89+
#[feature(globs, phase)];
8990

9091
#[cfg(test)] #[phase(syntax, link)] extern crate log;
9192

branches/snap-stage3/src/libglob/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
3131
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
3232
html_root_url = "http://static.rust-lang.org/doc/master")];
33+
#[allow(deprecated_owned_vector)];
3334

3435
use std::cell::Cell;
3536
use std::{cmp, os, path};

branches/snap-stage3/src/libgreen/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
// NB this does *not* include globs, please keep it that way.
175175
#[feature(macro_rules, phase)];
176176
#[allow(visible_private_types)];
177-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
177+
#[allow(deprecated_owned_vector)];
178178

179179
#[cfg(test)] #[phase(syntax, link)] extern crate log;
180180
extern crate rand;

branches/snap-stage3/src/liblog/directive.rs

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

1111
use std::cmp;
12+
use std::vec_ng::Vec;
1213

1314
#[deriving(Show, Clone)]
1415
pub struct LogDirective {

branches/snap-stage3/src/liblog/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ use std::local_data;
126126
use std::os;
127127
use std::rt;
128128
use std::slice;
129+
use std::vec_ng::Vec;
129130

130131
use sync::one::{Once, ONCE_INIT};
131132

branches/snap-stage3/src/libnative/io/file_unix.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use std::libc;
1919
use std::mem;
2020
use std::rt::rtio;
2121
use std::slice;
22+
use std::vec_ng::Vec;
2223

2324
use io::{IoResult, retry, keep_going};
2425

branches/snap-stage3/src/libnative/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
html_root_url = "http://static.rust-lang.org/doc/master")];
5151
#[deny(unused_result, unused_must_use)];
5252
#[allow(non_camel_case_types)];
53-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
53+
#[allow(deprecated_owned_vector)];
5454

5555
// NB this crate explicitly does *not* allow glob imports, please seriously
5656
// consider whether they're needed before adding that feature here (the

branches/snap-stage3/src/libnum/bigint.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ use rand::Rng;
2828
use std::str;
2929
use std::uint;
3030
use std::{i64, u64};
31-
use std::vec;
31+
use std::vec_ng;
32+
use std::vec_ng::Vec;
3233

3334
/**
3435
A `BigDigit` is a `BigUint`'s composing element.
@@ -752,7 +753,7 @@ impl BigUint {
752753
fn shl_unit(&self, n_unit: uint) -> BigUint {
753754
if n_unit == 0 || self.is_zero() { return (*self).clone(); }
754755

755-
return BigUint::new(vec::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
756+
return BigUint::new(vec_ng::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
756757
self.data.as_slice()));
757758
}
758759

@@ -1460,6 +1461,7 @@ mod biguint_tests {
14601461
use std::num::CheckedDiv;
14611462
use rand::{task_rng};
14621463
use std::u64;
1464+
use std::vec_ng::Vec;
14631465
14641466
#[test]
14651467
fn test_from_slice() {
@@ -2193,6 +2195,7 @@ mod bigint_tests {
21932195
use std::num::{ToPrimitive, FromPrimitive};
21942196
use rand::{task_rng};
21952197
use std::u64;
2198+
use std::vec_ng::Vec;
21962199
21972200
#[test]
21982201
fn test_from_biguint() {

branches/snap-stage3/src/libnum/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
1818
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
1919
html_root_url = "http://static.rust-lang.org/doc/master")];
20+
#[allow(deprecated_owned_vector)];
2021

2122
extern crate rand;
2223

branches/snap-stage3/src/libnum/rational.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use std::cmp;
1616
use std::fmt;
1717
use std::from_str::FromStr;
1818
use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
19+
use std::vec_ng::Vec;
1920
use bigint::{BigInt, BigUint, Sign, Plus, Minus};
2021

2122
/// Represents the ratio between 2 numbers.

branches/snap-stage3/src/librand/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ println!("{:?}", tuple_ptr)
7171
html_root_url = "http://static.rust-lang.org/doc/master")];
7272

7373
#[feature(macro_rules, managed_boxes, phase)];
74-
#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
74+
#[allow(deprecated_owned_vector)];
7575

7676
#[cfg(test)]
7777
#[phase(syntax, link)] extern crate log;

branches/snap-stage3/src/librustc/back/archive.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use metadata::filesearch;
1616
use lib::llvm::{ArchiveRef, llvm};
1717

1818
use std::cast;
19+
use std::vec_ng::Vec;
1920
use std::io;
2021
use std::io::{fs, TempDir};
2122
use std::libc;

branches/snap-stage3/src/librustc/back/link.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ use std::ptr;
3333
use std::str;
3434
use std::io;
3535
use std::io::{fs, TempDir, Process};
36+
use std::vec_ng::Vec;
3637
use flate;
3738
use serialize::hex::ToHex;
3839
use syntax::abi;
@@ -104,6 +105,7 @@ pub mod write {
104105
use std::io::Process;
105106
use std::libc::{c_uint, c_int};
106107
use std::str;
108+
use std::vec_ng::Vec;
107109

108110
// On android, we by default compile for armv7 processors. This enables
109111
// things like double word CAS instructions (rather than emulating them)

branches/snap-stage3/src/librustc/back/mips.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use back::target_strs;
1212
use driver::session::sess_os_to_meta_os;
1313
use metadata::loader::meta_section_name;
14+
use std::vec_ng::Vec;
1415
use syntax::abi;
1516

1617
pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {

branches/snap-stage3/src/librustc/back/rpath.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use metadata::filesearch;
1515

1616
use collections::HashSet;
1717
use std::{os, slice};
18+
use std::vec_ng::Vec;
1819
use syntax::abi;
1920

2021
fn not_win32(os: abi::Os) -> bool {

branches/snap-stage3/src/librustc/back/target_strs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#[allow(non_camel_case_types)];
1212

13+
use std::vec_ng::Vec;
14+
1315
pub struct t {
1416
module_asm: ~str,
1517
meta_sect_name: ~str,

branches/snap-stage3/src/librustc/driver/driver.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ use std::io::fs;
3737
use std::io::MemReader;
3838
use std::mem::drop;
3939
use std::os;
40-
use std::vec;
40+
use std::vec_ng::Vec;
41+
use std::vec_ng;
4142
use getopts::{optopt, optmulti, optflag, optflagopt};
4243
use getopts;
4344
use syntax::ast;
@@ -137,7 +138,7 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
137138
} else {
138139
InternedString::new("nogc")
139140
});
140-
return vec::append(user_cfg.move_iter().collect(),
141+
return vec_ng::append(user_cfg.move_iter().collect(),
141142
default_cfg.as_slice());
142143
}
143144

@@ -834,7 +835,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> session::Options {
834835

835836
let level_short = level_name.slice_chars(0, 1);
836837
let level_short = level_short.to_ascii().to_upper().into_str();
837-
let flags = vec::append(matches.opt_strs(level_short)
838+
let flags = vec_ng::append(matches.opt_strs(level_short)
838839
.move_iter()
839840
.collect(),
840841
matches.opt_strs(level_name));

branches/snap-stage3/src/librustc/driver/session.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use syntax::{abi, ast, codemap};
2828
use syntax;
2929

3030
use std::cell::{Cell, RefCell};
31+
use std::vec_ng::Vec;
3132
use collections::HashSet;
3233

3334
pub struct Config {
@@ -406,7 +407,7 @@ macro_rules! cgoptions(
406407
}
407408
}
408409

409-
fn parse_list(slot: &mut Vec<~str>, v: Option<&str>)
410+
fn parse_list(slot: &mut ::std::vec_ng::Vec<~str>, v: Option<&str>)
410411
-> bool {
411412
match v {
412413
Some(s) => {

branches/snap-stage3/src/librustc/front/config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use std::vec_ng::Vec;
1112
use syntax::fold::Folder;
1213
use syntax::{ast, fold, attr};
1314
use syntax::codemap;

branches/snap-stage3/src/librustc/front/feature_gate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use syntax::parse::token;
3131
use driver::session::Session;
3232

3333
use std::cell::Cell;
34+
use std::vec_ng::Vec;
3435

3536
/// This is a list of all known features since the beginning of time. This list
3637
/// can never shrink, it may only be expanded (in order to prevent old programs

branches/snap-stage3/src/librustc/front/std_inject.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
use driver::session::Session;
1313

14-
use std::vec;
14+
use std::vec_ng::Vec;
15+
use std::vec_ng;
1516
use syntax::ast;
1617
use syntax::attr;
1718
use syntax::codemap::DUMMY_SP;
@@ -181,7 +182,7 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
181182
span: DUMMY_SP,
182183
};
183184

184-
let vis = vec::append(vec!(vi2), module.view_items.as_slice());
185+
let vis = vec_ng::append(vec!(vi2), module.view_items.as_slice());
185186

186187
// FIXME #2543: Bad copy.
187188
let new_module = ast::Mod {

0 commit comments

Comments
 (0)