diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-14 23:05:01 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-19 12:59:40 -0700 |
| commit | 9d5d97b55d6487ee23b805bc1acbaa0669b82116 (patch) | |
| tree | b72dcf7045e331e94ea0f8658d088ab42d917935 /src/test | |
| parent | fb169d5543c84e11038ba2d07b538ec88fb49ca6 (diff) | |
| download | rust-9d5d97b55d6487ee23b805bc1acbaa0669b82116.tar.gz rust-9d5d97b55d6487ee23b805bc1acbaa0669b82116.zip | |
Remove a large amount of deprecated functionality
Spring cleaning is here! In the Fall! This commit removes quite a large amount of deprecated functionality from the standard libraries. I tried to ensure that only old deprecated functionality was removed. This is removing lots and lots of deprecated features, so this is a breaking change. Please consult the deprecation messages of the deleted code to see how to migrate code forward if it still needs migration. [breaking-change]
Diffstat (limited to 'src/test')
162 files changed, 286 insertions, 529 deletions
diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs index 049a91cfdeb..12ab62267a3 100644 --- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs +++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="anonexternmod#0.1"] +#![crate_name="anonexternmod"] extern crate libc; diff --git a/src/test/auxiliary/cci_impl_lib.rs b/src/test/auxiliary/cci_impl_lib.rs index ec48862ff39..40a9a52061f 100644 --- a/src/test/auxiliary/cci_impl_lib.rs +++ b/src/test/auxiliary/cci_impl_lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="cci_impl_lib"] +#![crate_name="cci_impl_lib"] pub trait uint_helpers { fn to(&self, v: uint, f: |uint|); diff --git a/src/test/auxiliary/cci_iter_lib.rs b/src/test/auxiliary/cci_iter_lib.rs index 2619ac71d99..84ade3572f9 100644 --- a/src/test/auxiliary/cci_iter_lib.rs +++ b/src/test/auxiliary/cci_iter_lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="cci_iter_lib"] +#![crate_name="cci_iter_lib"] #[inline] pub fn iter<T>(v: &[T], f: |&T|) { diff --git a/src/test/auxiliary/cci_no_inline_lib.rs b/src/test/auxiliary/cci_no_inline_lib.rs index e9f82ef9413..67f55cca1e1 100644 --- a/src/test/auxiliary/cci_no_inline_lib.rs +++ b/src/test/auxiliary/cci_no_inline_lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="cci_no_inline_lib"] +#![crate_name="cci_no_inline_lib"] // same as cci_iter_lib, more-or-less, but not marked inline @@ -16,7 +16,7 @@ pub fn iter(v: Vec<uint> , f: |uint|) { let mut i = 0u; let n = v.len(); while i < n { - f(*v.get(i)); + f(v[i]); i += 1u; } } diff --git a/src/test/auxiliary/changing-crates-a1.rs b/src/test/auxiliary/changing-crates-a1.rs index 360ab79c5b4..18162c5f756 100644 --- a/src/test/auxiliary/changing-crates-a1.rs +++ b/src/test/auxiliary/changing-crates-a1.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "a"] +#![crate_name = "a"] pub fn foo<T>() {} diff --git a/src/test/auxiliary/changing-crates-a2.rs b/src/test/auxiliary/changing-crates-a2.rs index 650b3ac7dca..a54dcbbbfc2 100644 --- a/src/test/auxiliary/changing-crates-a2.rs +++ b/src/test/auxiliary/changing-crates-a2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "a"] +#![crate_name = "a"] pub fn foo<T>() { println!("hello!"); } diff --git a/src/test/auxiliary/changing-crates-b.rs b/src/test/auxiliary/changing-crates-b.rs index 63bdb889fd0..81f924e29da 100644 --- a/src/test/auxiliary/changing-crates-b.rs +++ b/src/test/auxiliary/changing-crates-b.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "b"] +#![crate_name = "b"] extern crate a; diff --git a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs index 5e2a04001b5..f3d5bf2d65e 100644 --- a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs +++ b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crate_method_reexport_grrrrrrr2"] +#![crate_name="crate_method_reexport_grrrrrrr2"] pub use name_pool::add; diff --git a/src/test/auxiliary/crateresolve3-1.rs b/src/test/auxiliary/crateresolve3-1.rs index 9d00b92182e..473528c681e 100644 --- a/src/test/auxiliary/crateresolve3-1.rs +++ b/src/test/auxiliary/crateresolve3-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve3#0.1"] +#![crate_name="crateresolve3#0.1"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/crateresolve3-2.rs b/src/test/auxiliary/crateresolve3-2.rs index 117e585e9ad..1e95fa6b639 100644 --- a/src/test/auxiliary/crateresolve3-2.rs +++ b/src/test/auxiliary/crateresolve3-2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve3#0.2"] +#![crate_name="crateresolve3#0.2"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/crateresolve4a-1.rs b/src/test/auxiliary/crateresolve4a-1.rs index dfe1d92c593..68a69f6dc90 100644 --- a/src/test/auxiliary/crateresolve4a-1.rs +++ b/src/test/auxiliary/crateresolve4a-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve4a#0.1"] +#![crate_name="crateresolve4a#0.1"] #![crate_type = "lib"] pub fn f() -> int { 10 } diff --git a/src/test/auxiliary/crateresolve4a-2.rs b/src/test/auxiliary/crateresolve4a-2.rs index 196751e99fa..6e23fddbce7 100644 --- a/src/test/auxiliary/crateresolve4a-2.rs +++ b/src/test/auxiliary/crateresolve4a-2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve4a#0.2"] +#![crate_name="crateresolve4a#0.2"] #![crate_type = "lib"] pub fn g() -> int { 20 } diff --git a/src/test/auxiliary/crateresolve4b-1.rs b/src/test/auxiliary/crateresolve4b-1.rs index 54ee9c2d5a2..843fd57ee40 100644 --- a/src/test/auxiliary/crateresolve4b-1.rs +++ b/src/test/auxiliary/crateresolve4b-1.rs @@ -10,7 +10,7 @@ // aux-build:crateresolve4a-1.rs // aux-build:crateresolve4a-2.rs -#![crate_id="crateresolve4b#0.1"] +#![crate_name="crateresolve4b#0.1"] #![crate_type = "lib"] extern crate "crateresolve4a#0.2" as crateresolve4a; diff --git a/src/test/auxiliary/crateresolve4b-2.rs b/src/test/auxiliary/crateresolve4b-2.rs index 9221ecc697b..28c89c79316 100644 --- a/src/test/auxiliary/crateresolve4b-2.rs +++ b/src/test/auxiliary/crateresolve4b-2.rs @@ -10,7 +10,7 @@ // aux-build:crateresolve4a-1.rs // aux-build:crateresolve4a-2.rs -#![crate_id="crateresolve4b#0.2"] +#![crate_name="crateresolve4b#0.2"] #![crate_type = "lib"] extern crate "crateresolve4a#0.1" as crateresolve4a; diff --git a/src/test/auxiliary/crateresolve5-1.rs b/src/test/auxiliary/crateresolve5-1.rs index de48981ed3e..223e4f50ae8 100644 --- a/src/test/auxiliary/crateresolve5-1.rs +++ b/src/test/auxiliary/crateresolve5-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve5#0.1"] +#![crate_name="crateresolve5#0.1"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/crateresolve5-2.rs b/src/test/auxiliary/crateresolve5-2.rs index f8727605c3d..38740886b37 100644 --- a/src/test/auxiliary/crateresolve5-2.rs +++ b/src/test/auxiliary/crateresolve5-2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve5#0.2"] +#![crate_name="crateresolve5#0.2"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/crateresolve8-1.rs b/src/test/auxiliary/crateresolve8-1.rs index 062d606a4c1..5262d662971 100644 --- a/src/test/auxiliary/crateresolve8-1.rs +++ b/src/test/auxiliary/crateresolve8-1.rs @@ -9,7 +9,7 @@ // except according to those terms. // default link meta for 'package_id' will be equal to filestem -#![crate_id="crateresolve8#0.1"] +#![crate_name="crateresolve8#0.1"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/crateresolve_calories-1.rs b/src/test/auxiliary/crateresolve_calories-1.rs index a0d7ae7cd2f..4dba722971e 100644 --- a/src/test/auxiliary/crateresolve_calories-1.rs +++ b/src/test/auxiliary/crateresolve_calories-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve_calories#0.1"] +#![crate_name="crateresolve_calories#0.1"] #![crate_type = "lib"] pub fn f() -> int { 100 } diff --git a/src/test/auxiliary/crateresolve_calories-2.rs b/src/test/auxiliary/crateresolve_calories-2.rs index bbad91625cc..c7e26c8f506 100644 --- a/src/test/auxiliary/crateresolve_calories-2.rs +++ b/src/test/auxiliary/crateresolve_calories-2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateresolve_calories#0.1"] +#![crate_name="crateresolve_calories#0.1"] #![crate_type = "lib"] pub fn f() -> int { 200 } diff --git a/src/test/auxiliary/foreign_lib.rs b/src/test/auxiliary/foreign_lib.rs index 500475091e0..a5d672e3c0c 100644 --- a/src/test/auxiliary/foreign_lib.rs +++ b/src/test/auxiliary/foreign_lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="foreign_lib"] +#![crate_name="foreign_lib"] pub mod rustrt { extern crate libc; diff --git a/src/test/auxiliary/inherited_stability.rs b/src/test/auxiliary/inherited_stability.rs index af3dd94fe1d..4016a76206b 100644 --- a/src/test/auxiliary/inherited_stability.rs +++ b/src/test/auxiliary/inherited_stability.rs @@ -7,7 +7,7 @@ // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="inherited_stability#0.1"] +#![crate_name="inherited_stability"] #![crate_type = "lib"] #![experimental] diff --git a/src/test/auxiliary/inline_dtor.rs b/src/test/auxiliary/inline_dtor.rs index fa0d447a8ed..dd1fdc2e498 100644 --- a/src/test/auxiliary/inline_dtor.rs +++ b/src/test/auxiliary/inline_dtor.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="inline_dtor#0.1"] +#![crate_name="inline_dtor"] pub struct Foo; diff --git a/src/test/auxiliary/iss.rs b/src/test/auxiliary/iss.rs index 3a9d76406e1..37edcdf7628 100644 --- a/src/test/auxiliary/iss.rs +++ b/src/test/auxiliary/iss.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="issue6919_3#0.1"] +#![crate_name="issue6919_3"] // part of issue-6919.rs diff --git a/src/test/auxiliary/issue-2380.rs b/src/test/auxiliary/issue-2380.rs index 1cba738c564..af6bb050ef5 100644 --- a/src/test/auxiliary/issue-2380.rs +++ b/src/test/auxiliary/issue-2380.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="a"] +#![crate_name="a"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/issue-2414-a.rs b/src/test/auxiliary/issue-2414-a.rs index 08eaec2ed35..fe1ef549d06 100644 --- a/src/test/auxiliary/issue-2414-a.rs +++ b/src/test/auxiliary/issue-2414-a.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="a#0.1"] +#![crate_name="a"] #![crate_type = "lib"] type t1 = uint; diff --git a/src/test/auxiliary/issue-2414-b.rs b/src/test/auxiliary/issue-2414-b.rs index 51fd979f961..b1c95bcb430 100644 --- a/src/test/auxiliary/issue-2414-b.rs +++ b/src/test/auxiliary/issue-2414-b.rs @@ -9,7 +9,7 @@ // except according to those terms. -#![crate_id="b#0.1"] +#![crate_name="b"] #![crate_type = "lib"] extern crate a; diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs index c2e1dd69a90..e3ce4e8f656 100644 --- a/src/test/auxiliary/issue-2526.rs +++ b/src/test/auxiliary/issue-2526.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="issue_2526#0.2"] +#![crate_name="issue_2526"] #![crate_type = "lib"] #![feature(unsafe_destructor)] diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs index 3bedbd9089c..e340331dbfd 100644 --- a/src/test/auxiliary/issue-2631-a.rs +++ b/src/test/auxiliary/issue-2631-a.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="req"] +#![crate_name="req"] #![crate_type = "lib"] use std::cell::RefCell; @@ -19,7 +19,5 @@ pub type header_map = HashMap<String, Rc<RefCell<Vec<Rc<String>>>>>; // the unused ty param is necessary so this gets monomorphized pub fn request<T>(req: &header_map) { - let _x = (**((**req.get(&"METHOD".to_string())).clone()).borrow() - .clone() - .get(0)).clone(); + let _x = req["METHOD".to_string()].clone().borrow().clone()[0].clone(); } diff --git a/src/test/auxiliary/issue-3012-1.rs b/src/test/auxiliary/issue-3012-1.rs index dbb863da90a..25eb67e0423 100644 --- a/src/test/auxiliary/issue-3012-1.rs +++ b/src/test/auxiliary/issue-3012-1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="socketlib"] +#![crate_name="socketlib"] #![crate_type = "lib"] pub mod socket { diff --git a/src/test/auxiliary/issue-4208-cc.rs b/src/test/auxiliary/issue-4208-cc.rs index cc75ca6f3af..a7c1633784d 100644 --- a/src/test/auxiliary/issue-4208-cc.rs +++ b/src/test/auxiliary/issue-4208-cc.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="numeric#0.1"] +#![crate_name="numeric"] #![crate_type = "lib"] pub trait Trig<T> { diff --git a/src/test/auxiliary/issue_2242_a.rs b/src/test/auxiliary/issue_2242_a.rs index 4fae888c6ad..33b6d116c8a 100644 --- a/src/test/auxiliary/issue_2242_a.rs +++ b/src/test/auxiliary/issue_2242_a.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="a#0.1"] +#![crate_name="a#0.1"] #![crate_type = "lib"] trait to_strz { diff --git a/src/test/auxiliary/issue_2242_c.rs b/src/test/auxiliary/issue_2242_c.rs index 97d25568735..31d119b20be 100644 --- a/src/test/auxiliary/issue_2242_c.rs +++ b/src/test/auxiliary/issue_2242_c.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="c#0.1"] +#![crate_name="c#0.1"] #![crate_type = "lib"] extern crate a; diff --git a/src/test/auxiliary/issue_3979_traits.rs b/src/test/auxiliary/issue_3979_traits.rs index ef7e4d0fc09..91faace7a3f 100644 --- a/src/test/auxiliary/issue_3979_traits.rs +++ b/src/test/auxiliary/issue_3979_traits.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="issue_3979_traits#0.1"] +#![crate_name="issue_3979_traits"] #![crate_type = "lib"] diff --git a/src/test/auxiliary/lint_output_format.rs b/src/test/auxiliary/lint_output_format.rs index 00500da655f..181b651ef52 100755 --- a/src/test/auxiliary/lint_output_format.rs +++ b/src/test/auxiliary/lint_output_format.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="lint_output_format#0.1"] +#![crate_name="lint_output_format"] #![crate_type = "lib"] #[deprecated] diff --git a/src/test/auxiliary/lint_stability.rs b/src/test/auxiliary/lint_stability.rs index bae86f04b23..06031eb6c6c 100644 --- a/src/test/auxiliary/lint_stability.rs +++ b/src/test/auxiliary/lint_stability.rs @@ -7,7 +7,7 @@ // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="lint_stability#0.1"] +#![crate_name="lint_stability"] #![crate_type = "lib"] #![feature(macro_rules)] diff --git a/src/test/auxiliary/macro_crate_test.rs b/src/test/auxiliary/macro_crate_test.rs index befd33fca4e..1c26ac26d7c 100644 --- a/src/test/auxiliary/macro_crate_test.rs +++ b/src/test/auxiliary/macro_crate_test.rs @@ -51,7 +51,7 @@ fn expand_identity(cx: &mut ExtCtxt, _span: Span, tts: &[TokenTree]) -> Box<MacResult+'static> { // Parse an expression and emit it unchanged. let mut parser = parse::new_parser_from_tts(cx.parse_sess(), - cx.cfg(), Vec::from_slice(tts)); + cx.cfg(), tts.to_vec()); let expr = parser.parse_expr(); MacExpr::new(quote_expr!(&mut *cx, $expr)) } diff --git a/src/test/auxiliary/static-function-pointer-aux.rs b/src/test/auxiliary/static-function-pointer-aux.rs index c08f725ff0a..27befee6f07 100644 --- a/src/test/auxiliary/static-function-pointer-aux.rs +++ b/src/test/auxiliary/static-function-pointer-aux.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="static-function-pointer-aux"] +#![crate_name="static-function-pointer-aux"] pub fn f(x: int) -> int { -x } diff --git a/src/test/auxiliary/static-methods-crate.rs b/src/test/auxiliary/static-methods-crate.rs index afb35112fb8..eef2fdbfea9 100644 --- a/src/test/auxiliary/static-methods-crate.rs +++ b/src/test/auxiliary/static-methods-crate.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="static_methods_crate#0.1"] +#![crate_name="static_methods_crate"] #![crate_type = "lib"] use std::int; diff --git a/src/test/auxiliary/struct_variant_xc_aux.rs b/src/test/auxiliary/struct_variant_xc_aux.rs index 88b6b363222..4ef8701030f 100644 --- a/src/test/auxiliary/struct_variant_xc_aux.rs +++ b/src/test/auxiliary/struct_variant_xc_aux.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="struct_variant_xc_aux#0.1"] +#![crate_name="struct_variant_xc_aux"] #![crate_type = "lib"] #![feature(struct_variant)] diff --git a/src/test/auxiliary/svh-a-base.rs b/src/test/auxiliary/svh-a-base.rs index b83e96fc47d..c035f1203f8 100644 --- a/src/test/auxiliary/svh-a-base.rs +++ b/src/test/auxiliary/svh-a-base.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-lit.rs b/src/test/auxiliary/svh-a-change-lit.rs index 81c2c39bd52..614487c9817 100644 --- a/src/test/auxiliary/svh-a-change-lit.rs +++ b/src/test/auxiliary/svh-a-change-lit.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-significant-cfg.rs b/src/test/auxiliary/svh-a-change-significant-cfg.rs index 33dd3868566..99506309a59 100644 --- a/src/test/auxiliary/svh-a-change-significant-cfg.rs +++ b/src/test/auxiliary/svh-a-change-significant-cfg.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-trait-bound.rs b/src/test/auxiliary/svh-a-change-trait-bound.rs index 04c320d4016..8ec4eaebbe8 100644 --- a/src/test/auxiliary/svh-a-change-trait-bound.rs +++ b/src/test/auxiliary/svh-a-change-trait-bound.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-type-arg.rs b/src/test/auxiliary/svh-a-change-type-arg.rs index 33f2bf862ed..ad120e12f86 100644 --- a/src/test/auxiliary/svh-a-change-type-arg.rs +++ b/src/test/auxiliary/svh-a-change-type-arg.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-type-ret.rs b/src/test/auxiliary/svh-a-change-type-ret.rs index 3eea77fdb95..c68c13c0991 100644 --- a/src/test/auxiliary/svh-a-change-type-ret.rs +++ b/src/test/auxiliary/svh-a-change-type-ret.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-change-type-static.rs b/src/test/auxiliary/svh-a-change-type-static.rs index ff8b8d6db4c..6c13e84a7fe 100644 --- a/src/test/auxiliary/svh-a-change-type-static.rs +++ b/src/test/auxiliary/svh-a-change-type-static.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-comment.rs b/src/test/auxiliary/svh-a-comment.rs index 208f39ffedc..3d0973cb7ba 100644 --- a/src/test/auxiliary/svh-a-comment.rs +++ b/src/test/auxiliary/svh-a-comment.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-doc.rs b/src/test/auxiliary/svh-a-doc.rs index 667a3b28cea..1ad9e5e1c0e 100644 --- a/src/test/auxiliary/svh-a-doc.rs +++ b/src/test/auxiliary/svh-a-doc.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-macro.rs b/src/test/auxiliary/svh-a-macro.rs index f4279b44b4e..6bd36b5a9b1 100644 --- a/src/test/auxiliary/svh-a-macro.rs +++ b/src/test/auxiliary/svh-a-macro.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-no-change.rs b/src/test/auxiliary/svh-a-no-change.rs index b83e96fc47d..c035f1203f8 100644 --- a/src/test/auxiliary/svh-a-no-change.rs +++ b/src/test/auxiliary/svh-a-no-change.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-redundant-cfg.rs b/src/test/auxiliary/svh-a-redundant-cfg.rs index 203dadd633e..d67c8f4c181 100644 --- a/src/test/auxiliary/svh-a-redundant-cfg.rs +++ b/src/test/auxiliary/svh-a-redundant-cfg.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-a-whitespace.rs b/src/test/auxiliary/svh-a-whitespace.rs index 9b332a294d6..73798f37875 100644 --- a/src/test/auxiliary/svh-a-whitespace.rs +++ b/src/test/auxiliary/svh-a-whitespace.rs @@ -15,7 +15,7 @@ #![feature(macro_rules)] -#![crate_id = "a"] +#![crate_name = "a"] macro_rules! three { () => { 3 } diff --git a/src/test/auxiliary/svh-b.rs b/src/test/auxiliary/svh-b.rs index 713fed591c8..b8946fdc995 100644 --- a/src/test/auxiliary/svh-b.rs +++ b/src/test/auxiliary/svh-b.rs @@ -16,7 +16,7 @@ //! the change could affect the downstream crate content or not //! (#14132). -#![crate_id = "b"] +#![crate_name = "b"] extern crate a; diff --git a/src/test/auxiliary/svh-uta-base.rs b/src/test/auxiliary/svh-uta-base.rs index 5b4617c05ea..67fdac5df03 100644 --- a/src/test/auxiliary/svh-uta-base.rs +++ b/src/test/auxiliary/svh-uta-base.rs @@ -15,7 +15,7 @@ //! //! This is the upstream crate. -#![crate_id = "uta"] +#![crate_name = "uta"] mod traits { pub trait TraitA { fn val(&self) -> int { 2 } } diff --git a/src/test/auxiliary/svh-uta-change-use-trait.rs b/src/test/auxiliary/svh-uta-change-use-trait.rs index 1a2fb3cee1e..dfcf02c0ff5 100644 --- a/src/test/auxiliary/svh-uta-change-use-trait.rs +++ b/src/test/auxiliary/svh-uta-change-use-trait.rs @@ -15,7 +15,7 @@ //! //! This is the upstream crate. -#![crate_id = "uta"] +#![crate_name = "uta"] mod traits { pub trait TraitA { fn val(&self) -> int { 2 } } diff --git a/src/test/auxiliary/svh-utb.rs b/src/test/auxiliary/svh-utb.rs index ccc0bac5150..eb3da985242 100644 --- a/src/test/auxiliary/svh-utb.rs +++ b/src/test/auxiliary/svh-utb.rs @@ -15,7 +15,7 @@ //! //! This is the downstream crate. -#![crate_id = "utb"] +#![crate_name = "utb"] extern crate uta; diff --git a/src/test/auxiliary/trait_default_method_xc_aux.rs b/src/test/auxiliary/trait_default_method_xc_aux.rs index 159ecdcb42a..7424c21be3d 100644 --- a/src/test/auxiliary/trait_default_method_xc_aux.rs +++ b/src/test/auxiliary/trait_default_method_xc_aux.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="trait_default_method_xc_aux"] +#![crate_name="trait_default_method_xc_aux"] pub struct Something { pub x: int } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 9af3c0c6c8c..404e2e31b05 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -68,7 +68,7 @@ fn shift_push() { let mut v2 = Vec::new(); while v1.len() > 0 { - v2.push(v1.shift().unwrap()); + v2.push(v1.remove(0).unwrap()); } } @@ -93,9 +93,11 @@ fn vec_plus() { while i < 1500 { let rv = Vec::from_elem(r.gen_range(0u, i + 1), i); if r.gen() { - v.push_all_move(rv); + v.extend(rv.into_iter()); } else { - v = rv.clone().append(v.as_slice()); + let mut rv = rv.clone(); + rv.push_all(v.as_slice()); + v = rv; } i += 1; } @@ -109,10 +111,14 @@ fn vec_append() { while i < 1500 { let rv = Vec::from_elem(r.gen_range(0u, i + 1), i); if r.gen() { - v = v.clone().append(rv.as_slice()); + let mut t = v.clone(); + t.push_all(rv.as_slice()); + v = t; } else { - v = rv.clone().append(v.as_slice()); + let mut t = rv.clone(); + t.push_all(v.as_slice()); + v = t; } i += 1; } diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index 1f527e89eb2..98113cb8347 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -21,7 +21,7 @@ fn main() { args.into_iter().collect() }; - let n = from_str::<uint>(args.get(1).as_slice()).unwrap(); + let n = from_str::<uint>(args[1].as_slice()).unwrap(); for i in range(0u, n) { let x = i.to_string(); diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index d1a2dcf6d55..1a9ffd68284 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -72,8 +72,8 @@ fn main() { args.clone().into_iter().collect() }; - let num_tasks = from_str::<uint>(args.get(1).as_slice()).unwrap(); - let msg_per_task = from_str::<uint>(args.get(2).as_slice()).unwrap(); + let num_tasks = from_str::<uint>(args[1].as_slice()).unwrap(); + let msg_per_task = from_str::<uint>(args[2].as_slice()).unwrap(); let (mut num_chan, num_port) = init(); diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index c07656a5e4b..5e192a14793 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -72,8 +72,8 @@ fn main() { args.clone().into_iter().collect() }; - let num_tasks = from_str::<uint>(args.get(1).as_slice()).unwrap(); - let msg_per_task = from_str::<uint>(args.get(2).as_slice()).unwrap(); + let num_tasks = from_str::<uint>(args[1].as_slice()).unwrap(); + let msg_per_task = from_str::<uint>(args[2].as_slice()).unwrap(); let (mut num_chan, num_port) = init(); diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index 90d2c857858..e7a50382c94 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -31,6 +31,6 @@ fn main() { } else { args.into_iter().collect() }; - let n = from_str::<int>(args.get(1).as_slice()).unwrap(); + let n = from_str::<int>(args[1].as_slice()).unwrap(); println!("Ack(3,{}): {}\n", n, ack(3, n)); } diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index 1f42cc6e00c..10c0d0a8044 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -27,6 +27,6 @@ fn main() { } else { args.into_iter().collect() }; - let n = from_str::<int>(args.get(1).as_slice()).unwrap(); + let n = from_str::<int>(args[1].as_slice()).unwrap(); println!("{}\n", fib(n)); } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 1754df9bf44..5d77e27f948 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -83,7 +83,7 @@ fn find(mm: &HashMap<Vec<u8> , uint>, key: String) -> uint { // given a map, increment the counter for a key fn update_freq(mm: &mut HashMap<Vec<u8> , uint>, key: &[u8]) { - let key = Vec::from_slice(key); + let key = key.to_vec(); let newval = match mm.pop(&key) { Some(v) => v + 1, None => 1 @@ -103,7 +103,7 @@ fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> Vec<u8> { ii += 1u; } - return Vec::from_slice(bb[len - (nn - 1u)..len]); + return bb[len - (nn - 1u)..len].to_vec(); } fn make_sequence_processor(sz: uint, @@ -117,15 +117,14 @@ fn make_sequence_processor(sz: uint, loop { - line = from_parent.recv(); - if line == Vec::new() { break; } + line = from_parent.recv(); + if line == Vec::new() { break; } - carry = windows_with_carry(carry.append(line.as_slice()).as_slice(), - sz, - |window| { - update_freq(&mut freqs, window); - total += 1u; - }); + carry.push_all(line.as_slice()); + carry = windows_with_carry(carry.as_slice(), sz, |window| { + update_freq(&mut freqs, window); + total += 1u; + }); } let buffer = match sz { @@ -149,7 +148,7 @@ fn main() { let rdr = if os::getenv("RUST_BENCH").is_some() { let foo = include_bin!("shootout-k-nucleotide.data"); - box MemReader::new(Vec::from_slice(foo)) as Box<Reader> + box MemReader::new(foo.to_vec()) as Box<Reader> } else { box stdio::stdin() as Box<Reader> }; @@ -203,8 +202,8 @@ fn main() { let line_bytes = line.as_bytes(); for (ii, _sz) in sizes.iter().enumerate() { - let lb = Vec::from_slice(line_bytes); - to_child.get(ii).send(lb); + let lb = line_bytes.to_vec(); + to_child[ii].send(lb); } } @@ -215,11 +214,11 @@ fn main() { // finish... for (ii, _sz) in sizes.iter().enumerate() { - to_child.get(ii).send(Vec::new()); + to_child[ii].send(Vec::new()); } // now fetch and print result messages for (ii, _sz) in sizes.iter().enumerate() { - println!("{}", from_child.get(ii).recv()); + println!("{}", from_child[ii].recv()); } } diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index 3c8e8389564..8486fa5b034 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -102,7 +102,7 @@ fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: int) { for _ in range(0, steps) { let mut b_slice = bodies.as_mut_slice(); loop { - let bi = match b_slice.mut_shift_ref() { + let bi = match shift_mut_ref(&mut b_slice) { Some(bi) => bi, None => break }; @@ -183,3 +183,21 @@ fn main() { println!("{:.9f}", energy(&bodies)); } + +/// Pop a mutable reference off the head of a slice, mutating the slice to no +/// longer contain the mutable reference. This is a safe operation because the +/// two mutable borrows are entirely disjoint. +fn shift_mut_ref<'a, T>(r: &mut &'a mut [T]) -> Option<&'a mut T> { + use std::mem; + use std::raw::Repr; + + if r.len() == 0 { return None } + unsafe { + let mut raw = r.repr(); + let ret = raw.data as *mut T; + raw.data = raw.data.offset(1); + raw.len -= 1; + *r = mem::transmute(raw); + Some(unsafe { &mut *ret }) + } +} diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 516bd99ab55..91b9e058e8f 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -102,7 +102,7 @@ fn main() { if opts.stress { stress(2); } else { - let max = uint::parse_bytes(args.get(1).as_bytes(), 10u).unwrap() as + let max = uint::parse_bytes(args[1].as_bytes(), 10u).unwrap() as int; let num_trials = 10; diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index c495e597ca6..2086980b016 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -25,7 +25,7 @@ fn append_sequential(min: uint, max: uint, map: &mut SmallIntMap<uint>) { fn check_sequential(min: uint, max: uint, map: &SmallIntMap<uint>) { for i in range(min, max) { - assert_eq!(*map.get(&i), i + 22u); + assert_eq!(map[i], i + 22u); } } @@ -38,8 +38,8 @@ fn main() { } else { args.into_iter().collect() }; - let max = from_str::<uint>(args.get(1).as_slice()).unwrap(); - let rep = from_str::<uint>(args.get(2).as_slice()).unwrap(); + let max = from_str::<uint>(args[1].as_slice()).unwrap(); + let rep = from_str::<uint>(args[2].as_slice()).unwrap(); let mut checkf = 0.0; let mut appendf = 0.0; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 728f6bd043a..01c412c6d31 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -55,8 +55,8 @@ impl Sudoku { pub fn equal(&self, other: &Sudoku) -> bool { for row in range(0u8, 9u8) { for col in range(0u8, 9u8) { - if *self.grid.get(row as uint).get(col as uint) != - *other.grid.get(row as uint).get(col as uint) { + if self.grid[row as uint][col as uint] != + other.grid[row as uint][col as uint] { return false; } } @@ -77,10 +77,10 @@ impl Sudoku { .collect(); if comps.len() == 3u { - let row = from_str::<uint>(*comps.get(0)).unwrap() as u8; - let col = from_str::<uint>(*comps.get(1)).unwrap() as u8; + let row = from_str::<uint>(comps[0]).unwrap() as u8; + let col = from_str::<uint>(comps[1]).unwrap() as u8; *g.get_mut(row as uint).get_mut(col as uint) = - from_str::<uint>(*comps.get(2)).unwrap() as u8; + from_str::<uint>(comps[2]).unwrap() as u8; } else { fail!("Invalid sudoku file"); @@ -91,11 +91,9 @@ impl Sudoku { pub fn write(&self, writer: &mut io::Writer) { for row in range(0u8, 9u8) { - write!(writer, "{}", *self.grid.get(row as uint).get(0)); + write!(writer, "{}", self.grid[row as uint][0]); for col in range(1u8, 9u8) { - write!(writer, " {}", *self.grid - .get(row as uint) - .get(col as uint)); + write!(writer, " {}", self.grid[row as uint][col as uint]); } write!(writer, "\n"); } @@ -106,7 +104,7 @@ impl Sudoku { let mut work: Vec<(u8, u8)> = Vec::new(); /* queue of uncolored fields */ for row in range(0u8, 9u8) { for col in range(0u8, 9u8) { - let color = *self.grid.get(row as uint).get(col as uint); + let color = self.grid[row as uint][col as uint]; if color == 0u8 { work.push((row, col)); } @@ -116,9 +114,9 @@ impl Sudoku { let mut ptr = 0u; let end = work.len(); while ptr < end { - let (row, col) = *work.get(ptr); + let (row, col) = work[ptr]; // is there another color to try? - let the_color = *self.grid.get(row as uint).get(col as uint) + + let the_color = self.grid[row as uint][col as uint] + (1 as u8); if self.next_color(row, col, the_color) { // yes: advance work list @@ -151,12 +149,10 @@ impl Sudoku { // find colors available in neighbourhood of (row, col) fn drop_colors(&mut self, avail: &mut Colors, row: u8, col: u8) { for idx in range(0u8, 9u8) { - avail.remove(*self.grid - .get(idx as uint) - .get(col as uint)); /* check same column fields */ - avail.remove(*self.grid - .get(row as uint) - .get(idx as uint)); /* check same row fields */ + /* check same column fields */ + avail.remove(self.grid[idx as uint][col as uint]); + /* check same row fields */ + avail.remove(self.grid[row as uint][idx as uint]); } // check same block fields @@ -164,9 +160,7 @@ impl Sudoku { let col0 = (col / 3u8) * 3u8; for alt_row in range(row0, row0 + 3u8) { for alt_col in range(col0, col0 + 3u8) { - avail.remove(*self.grid - .get(alt_row as uint) - .get(alt_col as uint)); + avail.remove(self.grid[alt_row as uint][alt_col as uint]); } } } diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index a86b797544a..bdeee5fb6e0 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -78,21 +78,22 @@ fn recurse_or_fail(depth: int, st: Option<State>) { let depth = depth - 1; let st = match st { - None => { - State { - unique: box Nil, - vec: vec!(box Nil), - res: r(box Nil) + None => { + State { + unique: box Nil, + vec: vec!(box Nil), + res: r(box Nil) + } } - } - Some(st) => { - State { - unique: box Cons((), box *st.unique), - vec: st.vec.clone().append( - &[box Cons((), st.vec.last().unwrap().clone())]), - res: r(box Cons((), st.res._l.clone())) + Some(st) => { + let mut v = st.vec.clone(); + v.push_all(&[box Cons((), st.vec.last().unwrap().clone())]); + State { + unique: box Cons((), box *st.unique), + vec: v, + res: r(box Cons((), st.res._l.clone())), + } } - } }; recurse_or_fail(depth, Some(st)); diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/task-perf-jargon-metal-smoke.rs index 17e1ad423f9..9ebdbf0682d 100644 --- a/src/test/bench/task-perf-jargon-metal-smoke.rs +++ b/src/test/bench/task-perf-jargon-metal-smoke.rs @@ -49,7 +49,7 @@ fn main() { }; let (tx, rx) = channel(); - child_generation(from_str::<uint>(args.get(1).as_slice()).unwrap(), tx); + child_generation(from_str::<uint>(args[1].as_slice()).unwrap(), tx); if rx.recv_opt().is_err() { fail!("it happened when we slumbered"); } diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs index a871ac989f3..533005b1fb3 100644 --- a/src/test/bench/task-perf-spawnalot.rs +++ b/src/test/bench/task-perf-spawnalot.rs @@ -31,7 +31,7 @@ fn main() { } else { args.into_iter().collect() }; - let n = from_str::<uint>(args.get(1).as_slice()).unwrap(); + let n = from_str::<uint>(args[1].as_slice()).unwrap(); let mut i = 0u; while i < n { task::spawn(proc() f(n) ); i += 1u; } } diff --git a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs deleted file mode 100644 index 3ad17618fc0..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -fn main() { - let val = fourcc!("foo"); //~ ERROR string literal with len != 4 in fourcc! - let val2 = fourcc!("fooba"); //~ ERROR string literal with len != 4 in fourcc! -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs deleted file mode 100644 index 4d425d9a205..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -fn main() { - let val = fourcc!("foo ", bork); //~ ERROR invalid endian directive in fourcc! -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs deleted file mode 100644 index 1a6d747c1e8..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -fn main() { - let v = fourcc!("fooλ"); //~ ERROR fourcc! literal character out of range 0-255 -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs deleted file mode 100644 index 885d8dd1ec3..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -fn main() { - let val = fourcc!(foo); //~ ERROR non-literal in fourcc! -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs b/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs deleted file mode 100644 index da1c0070715..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -fn main() { - let val = fourcc!(45f32); //~ ERROR unsupported literal in fourcc! -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs deleted file mode 100644 index 191042f5f56..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate hexfloat; - -fn main() { - hexfloat!("foo"); - //~^ ERROR invalid hex float literal in hexfloat!: Expected '0' - hexfloat!("0"); - //~^ERROR invalid hex float literal in hexfloat!: Expected 'x' - hexfloat!("0x"); - //~^ERROR invalid hex float literal in hexfloat!: Expected '.' - hexfloat!("0x."); - //~^ERROR invalid hex float literal in hexfloat!: Expected digits before or after decimal point - hexfloat!("0x0.0"); - //~^ERROR invalid hex float literal in hexfloat!: Expected 'p' - hexfloat!("0x0.0p"); - //~^ERROR invalid hex float literal in hexfloat!: Expected exponent digits - hexfloat!("0x0.0p0f"); - //~^ERROR invalid hex float literal in hexfloat!: Expected end of string -} diff --git a/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs b/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs deleted file mode 100644 index f0ace43ec9e..00000000000 --- a/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate hexfloat; - -fn main() { - hexfloat!(foo); - //~^ ERROR non-literal in hexfloat! - hexfloat!(0); - //~^ ERROR unsupported literal in hexfloat! - hexfloat!("0x0.p0", invalid); - //~^ ERROR invalid floating point type in hexfloat! -} diff --git a/src/test/compile-fail/borrowck-assign-comp-idx.rs b/src/test/compile-fail/borrowck-assign-comp-idx.rs index 143ebdaa773..5bc2edba301 100644 --- a/src/test/compile-fail/borrowck-assign-comp-idx.rs +++ b/src/test/compile-fail/borrowck-assign-comp-idx.rs @@ -17,7 +17,7 @@ fn a() { let mut p = vec!(1); // Create an immutable pointer into p's contents: - let q: &int = p.get(0); + let q: &int = &p[0]; *p.get_mut(0) = 5; //~ ERROR cannot borrow diff --git a/src/test/compile-fail/borrowck-loan-vec-content.rs b/src/test/compile-fail/borrowck-loan-vec-content.rs index 393b528869a..31b5c44df66 100644 --- a/src/test/compile-fail/borrowck-loan-vec-content.rs +++ b/src/test/compile-fail/borrowck-loan-vec-content.rs @@ -18,13 +18,13 @@ fn takes_imm_elt(_v: &int, f: ||) { fn has_mut_vec_and_does_not_try_to_change_it() { let mut v = vec!(1, 2, 3); - takes_imm_elt(v.get(0), || {}) + takes_imm_elt(&v[0], || {}) } fn has_mut_vec_but_tries_to_change_it() { let mut v = vec!(1, 2, 3); takes_imm_elt( - v.get(0), + &v[0], || { //~ ERROR cannot borrow `v` as mutable *v.get_mut(1) = 4; }) diff --git a/src/test/compile-fail/borrowck-overloaded-index-2.rs b/src/test/compile-fail/borrowck-overloaded-index-2.rs index 6d2eae8bc1e..d9d7a43d46c 100644 --- a/src/test/compile-fail/borrowck-overloaded-index-2.rs +++ b/src/test/compile-fail/borrowck-overloaded-index-2.rs @@ -14,7 +14,7 @@ struct MyVec<T> { impl<T> Index<uint, T> for MyVec<T> { fn index(&self, &i: &uint) -> &T { - self.data.get(i) + &self.data[i] } } diff --git a/src/test/compile-fail/deprecated-url.rs b/src/test/compile-fail/deprecated-url.rs deleted file mode 100644 index 9f1c1fdd7c7..00000000000 --- a/src/test/compile-fail/deprecated-url.rs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-tidy-linelength - -#![deny(deprecated)] - -extern crate url; - -fn main() { - let _ = url::Url::parse("http://example.com"); - //~^ ERROR use of deprecated item: This is being removed. Use rust-url instead. http://servo.github.io/rust-url/ -} diff --git a/src/test/compile-fail/lub-if.rs b/src/test/compile-fail/lub-if.rs index 5440219e55e..6dcf1fdee83 100644 --- a/src/test/compile-fail/lub-if.rs +++ b/src/test/compile-fail/lub-if.rs @@ -16,14 +16,14 @@ pub fn opt_str0<'a>(maybestr: &'a Option<String>) -> &'a str { if maybestr.is_none() { "(none)" } else { - let s: &'a str = maybestr.get_ref().as_slice(); + let s: &'a str = maybestr.as_ref().unwrap().as_slice(); s } } pub fn opt_str1<'a>(maybestr: &'a Option<String>) -> &'a str { if maybestr.is_some() { - let s: &'a str = maybestr.get_ref().as_slice(); + let s: &'a str = maybestr.as_ref().unwrap().as_slice(); s } else { "(none)" @@ -34,14 +34,14 @@ pub fn opt_str2<'a>(maybestr: &'a Option<String>) -> &'static str { if maybestr.is_none() { "(none)" } else { - let s: &'a str = maybestr.get_ref().as_slice(); + let s: &'a str = maybestr.as_ref().unwrap().as_slice(); s //~ ERROR cannot infer an appropriate lifetime for automatic coercion due to conflicting } } pub fn opt_str3<'a>(maybestr: &'a Option<String>) -> &'static str { if maybestr.is_some() { - let s: &'a str = maybestr.get_ref().as_slice(); + let s: &'a str = maybestr.as_ref().unwrap().as_slice(); s //~ ERROR cannot infer an appropriate lifetime for automatic coercion due to conflicting } else { "(none)" diff --git a/src/test/compile-fail/moves-based-on-type-access-to-field.rs b/src/test/compile-fail/moves-based-on-type-access-to-field.rs index 85723936997..c9efce0d684 100644 --- a/src/test/compile-fail/moves-based-on-type-access-to-field.rs +++ b/src/test/compile-fail/moves-based-on-type-access-to-field.rs @@ -18,7 +18,7 @@ fn touch<A>(_a: &A) {} fn f20() { let x = vec!("hi".to_string()); consume(x.into_iter().next().unwrap()); - touch(x.get(0)); //~ ERROR use of moved value: `x` + touch(&x[0]); //~ ERROR use of moved value: `x` } fn main() {} diff --git a/src/test/compile-fail/moves-based-on-type-exprs.rs b/src/test/compile-fail/moves-based-on-type-exprs.rs index 330fd9f1ff0..1d6dc504ab4 100644 --- a/src/test/compile-fail/moves-based-on-type-exprs.rs +++ b/src/test/compile-fail/moves-based-on-type-exprs.rs @@ -30,7 +30,7 @@ fn f20() { fn f21() { let x = vec!(1i, 2, 3); - let _y = (*x.get(0), 3i); + let _y = (x[0], 3i); touch(&x); } @@ -96,8 +96,8 @@ fn f110() { fn f120() { let mut x = vec!("hi".to_string(), "ho".to_string()); x.as_mut_slice().swap(0, 1); - touch(x.get(0)); - touch(x.get(1)); + touch(&x[0]); + touch(&x[1]); } fn main() {} diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index ec218768a98..a07317176e4 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -18,10 +18,10 @@ fn main() { let arc_v = Arc::new(v); task::spawn(proc() { - assert_eq!(*arc_v.get(3), 4); + assert_eq!((*arc_v)[3], 4); }); - assert_eq!(*arc_v.get(2), 3); + assert_eq!((*arc_v)[2], 3); println!("{}", *arc_v); } diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index b8009031883..9f33f35838e 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -16,10 +16,10 @@ fn main() { let arc_v = Arc::new(v); task::spawn(proc() { - assert_eq!(*arc_v.get(3), 4); + assert_eq!((*arc_v)[3], 4); }); - assert_eq!(*arc_v.get(2), 3); //~ ERROR use of moved value: `arc_v` + assert_eq!((*arc_v)[2], 3); //~ ERROR use of moved value: `arc_v` println!("{}", *arc_v); //~ ERROR use of moved value: `arc_v` } diff --git a/src/test/compile-fail/ufcs-explicit-self-bad.rs b/src/test/compile-fail/ufcs-explicit-self-bad.rs index e5bad7e31b8..b639af61757 100644 --- a/src/test/compile-fail/ufcs-explicit-self-bad.rs +++ b/src/test/compile-fail/ufcs-explicit-self-bad.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::owned::Box; - struct Foo { f: int, } diff --git a/src/test/compile-fail/unresolved-extern-mod-suggestion.rs b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs index 62066eb29d0..33d3deb8733 100644 --- a/src/test/compile-fail/unresolved-extern-mod-suggestion.rs +++ b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern crate url; -use url; //~ ERROR unresolved import (maybe you meant `url::*`?) +extern crate core; +use core; //~ ERROR unresolved import (maybe you meant `core::*`?) fn main() {} diff --git a/src/test/compile-fail/writing-to-immutable-vec.rs b/src/test/compile-fail/writing-to-immutable-vec.rs index ab00a8a01e0..13eb6f860ba 100644 --- a/src/test/compile-fail/writing-to-immutable-vec.rs +++ b/src/test/compile-fail/writing-to-immutable-vec.rs @@ -11,5 +11,5 @@ fn main() { let v: Vec<int> = vec!(1, 2, 3); - *v.get(1) = 4; //~ ERROR cannot assign + v[1] = 4; //~ ERROR cannot assign } diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/bug-2470-bounds-check-overflow.rs index 0e116bcede5..9123342f09a 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow.rs @@ -31,5 +31,5 @@ fn main() { idx * mem::size_of::<uint>()); // This should fail. - println!("ov1 0x{:x}", *x.get(idx)); + println!("ov1 0x{:x}", x[idx]); } diff --git a/src/test/run-fail/glob-use-std.rs b/src/test/run-fail/glob-use-std.rs index bee60cd1205..bf04789bbc7 100644 --- a/src/test/run-fail/glob-use-std.rs +++ b/src/test/run-fail/glob-use-std.rs @@ -20,7 +20,5 @@ use std::*; fn main() { - String::from_byte(b'a'); // avoid an unused import message - fail!("fail works") } diff --git a/src/test/run-fail/issue-3029.rs b/src/test/run-fail/issue-3029.rs index 80e275019ce..539d2adc7d4 100644 --- a/src/test/run-fail/issue-3029.rs +++ b/src/test/run-fail/issue-3029.rs @@ -18,5 +18,5 @@ fn main() { let mut x = Vec::new(); let y = vec!(3i); fail!("so long"); - x.push_all_move(y); + x.extend(y.into_iter()); } diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs index 40ffe15fe86..281523a807e 100644 --- a/src/test/run-fail/vec-overrun.rs +++ b/src/test/run-fail/vec-overrun.rs @@ -14,8 +14,8 @@ fn main() { let v: Vec<int> = vec!(10); let x: uint = 0; - assert_eq!(*v.get(x), 10); + assert_eq!(v[x], 10); // Bounds-check failure. - assert_eq!(*v.get(x + 2), 20); + assert_eq!(v[x + 2], 20); } diff --git a/src/test/run-make/bootstrap-from-c-with-native/lib.rs b/src/test/run-make/bootstrap-from-c-with-native/lib.rs index d211167626d..99dd473344a 100644 --- a/src/test/run-make/bootstrap-from-c-with-native/lib.rs +++ b/src/test/run-make/bootstrap-from-c-with-native/lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="boot#0.1"] +#![crate_name="boot"] #![crate_type="dylib"] extern crate native; diff --git a/src/test/run-make/dep-info-custom/lib.rs b/src/test/run-make/dep-info-custom/lib.rs index 4255b1d934d..14baa8ca55a 100644 --- a/src/test/run-make/dep-info-custom/lib.rs +++ b/src/test/run-make/dep-info-custom/lib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="foo#0.1"] +#![crate_name="foo"] pub mod foo; pub mod bar; diff --git a/src/test/run-make/libs-through-symlinks/foo.rs b/src/test/run-make/libs-through-symlinks/foo.rs index 6864076d18e..dd818cf8798 100644 --- a/src/test/run-make/libs-through-symlinks/foo.rs +++ b/src/test/run-make/libs-through-symlinks/foo.rs @@ -9,4 +9,4 @@ // except according to those terms. #![crate_type = "rlib"] -#![crate_id = "foo"] +#![crate_name = "foo"] diff --git a/src/test/run-make/lto-syntax-extension/main.rs b/src/test/run-make/lto-syntax-extension/main.rs index ec4fbca48f8..0f6bd10b15d 100644 --- a/src/test/run-make/lto-syntax-extension/main.rs +++ b/src/test/run-make/lto-syntax-extension/main.rs @@ -11,8 +11,9 @@ #![feature(phase)] extern crate lib; -#[phase(plugin)] extern crate fourcc; +extern crate regex; +#[phase(plugin)] extern crate regex_macros; fn main() { - fourcc!("1234"); + regex!("1234"); } diff --git a/src/test/run-make/many-crates-but-no-match/crateA1.rs b/src/test/run-make/many-crates-but-no-match/crateA1.rs index 0c88cf4745a..dbfe920c85b 100644 --- a/src/test/run-make/many-crates-but-no-match/crateA1.rs +++ b/src/test/run-make/many-crates-but-no-match/crateA1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateA"] +#![crate_name="crateA"] // Base crate pub fn func<T>() {} diff --git a/src/test/run-make/many-crates-but-no-match/crateA2.rs b/src/test/run-make/many-crates-but-no-match/crateA2.rs index e3fb50e13d0..857c36aee60 100644 --- a/src/test/run-make/many-crates-but-no-match/crateA2.rs +++ b/src/test/run-make/many-crates-but-no-match/crateA2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateA"] +#![crate_name="crateA"] // Base crate pub fn func<T>() { println!("hello"); } diff --git a/src/test/run-make/many-crates-but-no-match/crateA3.rs b/src/test/run-make/many-crates-but-no-match/crateA3.rs index ad9d458be24..8b8dac5e862 100644 --- a/src/test/run-make/many-crates-but-no-match/crateA3.rs +++ b/src/test/run-make/many-crates-but-no-match/crateA3.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="crateA"] +#![crate_name="crateA"] // Base crate pub fn foo<T>() { println!("world!"); } diff --git a/src/test/run-make/rustdoc-hidden-line/foo.rs b/src/test/run-make/rustdoc-hidden-line/foo.rs index 26546cef0f0..c402da7987d 100644 --- a/src/test/run-make/rustdoc-hidden-line/foo.rs +++ b/src/test/run-make/rustdoc-hidden-line/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id="foo#0.1"] +#![crate_name="foo"] /// The '# ' lines should be removed from the output, but the #[deriving] should be /// retained. diff --git a/src/test/run-make/rustdoc-json/foo.rs b/src/test/run-make/rustdoc-json/foo.rs index dda66f051bc..d57a7164cdb 100644 --- a/src/test/run-make/rustdoc-json/foo.rs +++ b/src/test/run-make/rustdoc-json/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "foo#0.1"] +#![crate_name = "foo"] //! Very docs diff --git a/src/test/run-make/rustdoc-smoke/foo.rs b/src/test/run-make/rustdoc-smoke/foo.rs index b783dd39a06..499bcaff4d1 100644 --- a/src/test/run-make/rustdoc-smoke/foo.rs +++ b/src/test/run-make/rustdoc-smoke/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "foo#0.1"] +#![crate_name = "foo"] //! Very docs diff --git a/src/test/run-make/unicode-input/multiple_files.rs b/src/test/run-make/unicode-input/multiple_files.rs index 7c6d97dd5a3..2aa4264225c 100644 --- a/src/test/run-make/unicode-input/multiple_files.rs +++ b/src/test/run-make/unicode-input/multiple_files.rs @@ -34,8 +34,8 @@ fn random_char() -> char { fn main() { let args = os::args(); - let rustc = args.get(1).as_slice(); - let tmpdir = Path::new(args.get(2).as_slice()); + let rustc = args[1].as_slice(); + let tmpdir = Path::new(args[2].as_slice()); let main_file = tmpdir.join("unicode_input_multiple_files_main.rs"); { diff --git a/src/test/run-make/unicode-input/span_length.rs b/src/test/run-make/unicode-input/span_length.rs index e213e266548..7b096d7d583 100644 --- a/src/test/run-make/unicode-input/span_length.rs +++ b/src/test/run-make/unicode-input/span_length.rs @@ -33,8 +33,8 @@ fn random_char() -> char { fn main() { let args = os::args(); - let rustc = args.get(1).as_slice(); - let tmpdir = Path::new(args.get(2).as_slice()); + let rustc = args[1].as_slice(); + let tmpdir = Path::new(args[2].as_slice()); let main_file = tmpdir.join("span_main.rs"); for _ in range(0u, 100) { diff --git a/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs b/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs deleted file mode 100644 index b16975fe6ee..00000000000 --- a/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] - -#[phase(plugin)] -extern crate fourcc; - -static static_val: u32 = fourcc!("foo "); -static static_val_be: u32 = fourcc!("foo ", big); -static static_val_le: u32 = fourcc!("foo ", little); -static static_val_target: u32 = fourcc!("foo ", target); - -fn main() { - let val = fourcc!("foo ", big); - assert_eq!(val, 0x666f6f20u32); - assert_eq!(val, fourcc!("foo ")); - - let val = fourcc!("foo ", little); - assert_eq!(val, 0x206f6f66u32); - - let val = fourcc!("foo ", target); - let exp = if cfg!(target_endian = "big") { 0x666f6f20u32 } else { 0x206f6f66u32 }; - assert_eq!(val, exp); - - assert_eq!(static_val_be, 0x666f6f20u32); - assert_eq!(static_val, static_val_be); - assert_eq!(static_val_le, 0x206f6f66u32); - let exp = if cfg!(target_endian = "big") { 0x666f6f20u32 } else { 0x206f6f66u32 }; - assert_eq!(static_val_target, exp); - - assert_eq!(fourcc!("\xC0\xFF\xEE!"), 0xC0FFEE21); -} diff --git a/src/test/run-pass-fulldeps/syntax-extension-hexfloat.rs b/src/test/run-pass-fulldeps/syntax-extension-hexfloat.rs deleted file mode 100644 index 820606179bc..00000000000 --- a/src/test/run-pass-fulldeps/syntax-extension-hexfloat.rs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// ignore-stage1 -// ignore-pretty - -#![feature(phase)] -#[phase(plugin)] -extern crate hexfloat; - -pub fn main() { - let a = hexfloat!("0x1.999999999999ap-4"); - assert_eq!(a, 0.1f64); - let b = hexfloat!("-0x1.fffp-4", f32); - assert_eq!(b, -0.12498474_f32); - let c = hexfloat!("0x.12345p5", f64); - let d = hexfloat!("0x0.12345p5", f64); - assert_eq!(c,d); - let f = hexfloat!("0x10.p4", f32); - let g = hexfloat!("0x10.0p4", f32); - assert_eq!(f,g); -} diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/run-pass/assignability-trait.rs index 1ffee6aad76..0d90636ec91 100644 --- a/src/test/run-pass/assignability-trait.rs +++ b/src/test/run-pass/assignability-trait.rs @@ -41,7 +41,7 @@ fn length<A, T: iterable<A>>(x: T) -> uint { pub fn main() { let x: Vec<int> = vec!(0,1,2,3); // Call a method - x.iterate(|y| { assert!(*x.get(*y as uint) == *y); true }); + x.iterate(|y| { assert!(x[*y as uint] == *y); true }); // Call a parameterized function assert_eq!(length(x.clone()), x.len()); // Call a parameterized function, with type arguments that require diff --git a/src/test/run-pass/bare-fn-implements-fn-mut.rs b/src/test/run-pass/bare-fn-implements-fn-mut.rs index 37c551734de..4962e9d0f22 100644 --- a/src/test/run-pass/bare-fn-implements-fn-mut.rs +++ b/src/test/run-pass/bare-fn-implements-fn-mut.rs @@ -25,8 +25,9 @@ fn call_g<G:FnMut<(String,String),String>>(mut g: G, x: String, y: String) g(x, y) } -fn g(x: String, y: String) -> String { - x.append(y.as_slice()) +fn g(mut x: String, y: String) -> String { + x.push_str(y.as_slice()); + x } fn main() { diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck-mut-uniq.rs index 867fdd531e9..e644c49366d 100644 --- a/src/test/run-pass/borrowck-mut-uniq.rs +++ b/src/test/run-pass/borrowck-mut-uniq.rs @@ -23,7 +23,7 @@ fn add_int(x: &mut Ints, v: int) { fn iter_ints(x: &Ints, f: |x: &int| -> bool) -> bool { let l = x.values.len(); - range(0u, l).all(|i| f(x.values.get(i))) + range(0u, l).all(|i| f(&x.values[i])) } pub fn main() { diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/run-pass/call-closure-from-overloaded-op.rs index bf242316757..432d022c69b 100644 --- a/src/test/run-pass/call-closure-from-overloaded-op.rs +++ b/src/test/run-pass/call-closure-from-overloaded-op.rs @@ -14,5 +14,5 @@ fn foo() -> int { 22 } pub fn main() { let mut x: Vec<extern "Rust" fn() -> int> = Vec::new(); x.push(foo); - assert_eq!((*x.get(0))(), 22); + assert_eq!((x[0])(), 22); } diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs index ad7d818bd3b..646eed5de75 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs @@ -10,11 +10,11 @@ fn bar(v: &mut [uint]) -> Vec<uint> { - Vec::from_slice(v) + v.to_vec() } fn bip(v: &[uint]) -> Vec<uint> { - Vec::from_slice(v) + v.to_vec() } pub fn main() { diff --git a/src/test/run-pass/drop-with-type-ascription-1.rs b/src/test/run-pass/drop-with-type-ascription-1.rs index c4ea169cb79..8c0c0afa94b 100644 --- a/src/test/run-pass/drop-with-type-ascription-1.rs +++ b/src/test/run-pass/drop-with-type-ascription-1.rs @@ -11,7 +11,7 @@ fn main() { let foo = "hello".to_string(); let foo: Vec<&str> = foo.as_slice().words().collect(); - let invalid_string = foo.get(0); + let invalid_string = &foo[0]; assert_eq!(*invalid_string, "hello"); } diff --git a/src/test/run-pass/drop-with-type-ascription-2.rs b/src/test/run-pass/drop-with-type-ascription-2.rs index 634b1004e53..f55f47bbc59 100644 --- a/src/test/run-pass/drop-with-type-ascription-2.rs +++ b/src/test/run-pass/drop-with-type-ascription-2.rs @@ -10,8 +10,8 @@ fn main() { let args = vec!("foobie", "asdf::asdf"); - let arr: Vec<&str> = args.get(1).as_slice().split_str("::").collect(); - assert_eq!(*arr.get(0), "asdf"); - assert_eq!(*arr.get(0), "asdf"); + let arr: Vec<&str> = args[1].as_slice().split_str("::").collect(); + assert_eq!(arr[0], "asdf"); + assert_eq!(arr[0], "asdf"); } diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs index fc2912c184f..8172c16abf2 100644 --- a/src/test/run-pass/expr-fn.rs +++ b/src/test/run-pass/expr-fn.rs @@ -17,7 +17,7 @@ fn test_int() { fn test_vec() { fn f() -> Vec<int> { vec!(10, 11) } let vect = f(); - assert_eq!(*vect.get(1), 11); + assert_eq!(vect[1], 11); } fn test_generic() { diff --git a/src/test/run-pass/expr-match-fail.rs b/src/test/run-pass/expr-match-fail.rs index 872701e33ee..1f246581687 100644 --- a/src/test/run-pass/expr-match-fail.rs +++ b/src/test/run-pass/expr-match-fail.rs @@ -16,7 +16,7 @@ fn test_simple() { fn test_box() { let r = match true { true => { vec!(10i) } false => { fail!() } }; - assert_eq!(*r.get(0), 10i); + assert_eq!(r[0], 10i); } pub fn main() { test_simple(); test_box(); } diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs index 357d1201a4c..af6ca3c93d5 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/run-pass/foreach-nested.rs @@ -17,8 +17,8 @@ pub fn main() { two(|i| { two(|j| { *a.get_mut(p as uint) = 10 * i + j; p += 1; }) }); - assert_eq!(*a.get(0), 0); - assert_eq!(*a.get(1), 1); - assert_eq!(*a.get(2), 10); - assert_eq!(*a.get(3), 11); + assert_eq!(a[0], 0); + assert_eq!(a[1], 1); + assert_eq!(a[2], 10); + assert_eq!(a[3], 11); } diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index 8ff89ae2cde..87afd1601f6 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -52,7 +52,7 @@ mod map_reduce { } let (tx, rx) = channel(); println!("sending find_reducer"); - ctrl.send(find_reducer(Vec::from_slice(key.as_bytes()), tx)); + ctrl.send(find_reducer(key.as_bytes().to_vec(), tx)); println!("receiving"); let c = rx.recv(); println!("{}", c); diff --git a/src/test/run-pass/issue-13304.rs b/src/test/run-pass/issue-13304.rs index c868189197e..047ff74035b 100644 --- a/src/test/run-pass/issue-13304.rs +++ b/src/test/run-pass/issue-13304.rs @@ -29,7 +29,7 @@ fn parent() { let args = args.as_slice(); let mut p = io::process::Command::new(args[0].as_slice()) .arg("child").spawn().unwrap(); - p.stdin.get_mut_ref().write_str("test1\ntest2\ntest3").unwrap(); + p.stdin.as_mut().unwrap().write_str("test1\ntest2\ntest3").unwrap(); let out = p.wait_with_output().unwrap(); assert!(out.status.success()); let s = str::from_utf8(out.output.as_slice()).unwrap(); diff --git a/src/test/run-pass/issue-14021.rs b/src/test/run-pass/issue-14021.rs index f25a1fcdab6..a55cded87e5 100644 --- a/src/test/run-pass/issue-14021.rs +++ b/src/test/run-pass/issue-14021.rs @@ -19,7 +19,7 @@ struct UnitLikeStruct; pub fn main() { let obj = UnitLikeStruct; - let json_str: String = json::Encoder::str_encode(&obj); + let json_str: String = json::encode(&obj); let json_object = json::from_str(json_str.as_slice()); let mut decoder = json::Decoder::new(json_object.unwrap()); diff --git a/src/test/run-pass/issue-14456.rs b/src/test/run-pass/issue-14456.rs index bee4baf68a0..2339e3f6302 100644 --- a/src/test/run-pass/issue-14456.rs +++ b/src/test/run-pass/issue-14456.rs @@ -16,7 +16,7 @@ use std::os; fn main() { let args = os::args(); - if args.len() > 1 && args.get(1).as_slice() == "child" { + if args.len() > 1 && args[1].as_slice() == "child" { return child() } @@ -32,7 +32,7 @@ fn child() { fn test() { let args = os::args(); - let mut p = Command::new(args.get(0).as_slice()).arg("child") + let mut p = Command::new(args[0].as_slice()).arg("child") .stdin(process::Ignored) .stdout(process::Ignored) .stderr(process::Ignored) diff --git a/src/test/run-pass/issue-14940.rs b/src/test/run-pass/issue-14940.rs index e0a63331e97..acadc81df63 100644 --- a/src/test/run-pass/issue-14940.rs +++ b/src/test/run-pass/issue-14940.rs @@ -17,7 +17,7 @@ fn main() { let mut out = stdio::stdout(); out.write(['a' as u8, ..128 * 1024]).unwrap(); } else { - let out = Command::new(args.get(0).as_slice()).arg("child").output(); + let out = Command::new(args[0].as_slice()).arg("child").output(); let out = out.unwrap(); assert!(out.status.success()); } diff --git a/src/test/run-pass/issue-15149.rs b/src/test/run-pass/issue-15149.rs index cc80232691d..1fb17d4d5fa 100644 --- a/src/test/run-pass/issue-15149.rs +++ b/src/test/run-pass/issue-15149.rs @@ -15,8 +15,8 @@ use std::task::TaskBuilder; fn main() { // If we're the child, make sure we were invoked correctly let args = os::args(); - if args.len() > 1 && args.get(1).as_slice() == "child" { - return assert_eq!(args.get(0).as_slice(), "mytest"); + if args.len() > 1 && args[1].as_slice() == "child" { + return assert_eq!(args[0].as_slice(), "mytest"); } test(); diff --git a/src/test/run-pass/issue-15189.rs b/src/test/run-pass/issue-15189.rs index abf8b6dbbea..16212b5f529 100644 --- a/src/test/run-pass/issue-15189.rs +++ b/src/test/run-pass/issue-15189.rs @@ -12,7 +12,7 @@ #![feature(macro_rules)] -macro_rules! third(($e:expr)=>({let x = 2; *$e.get(x)})) +macro_rules! third(($e:expr)=>({let x = 2; $e[x]})) fn main() { let x = vec!(10u,11u,12u,13u); diff --git a/src/test/run-pass/issue-17216.rs b/src/test/run-pass/issue-17216.rs index 538b837d117..e48d7b0756c 100644 --- a/src/test/run-pass/issue-17216.rs +++ b/src/test/run-pass/issue-17216.rs @@ -25,7 +25,7 @@ fn main() { let mut dropped = false; { let leak = Leak { dropped: &mut dropped }; - for ((), leaked) in Some(((),leak)).move_iter() {} + for ((), leaked) in Some(((),leak)).into_iter() {} } assert!(dropped); diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs index 41cf3eaf7e3..9a00868cc12 100644 --- a/src/test/run-pass/issue-2383.rs +++ b/src/test/run-pass/issue-2383.rs @@ -15,5 +15,5 @@ use std::collections::Deque; pub fn main() { let mut q = RingBuf::new(); - q.push_back(10i); + q.push(10i); } diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/run-pass/issue-2804-2.rs index 32fefac52eb..952ea1e9d3d 100644 --- a/src/test/run-pass/issue-2804-2.rs +++ b/src/test/run-pass/issue-2804-2.rs @@ -17,7 +17,7 @@ extern crate collections; use std::collections::HashMap; fn add_interfaces(managed_ip: String, device: HashMap<String, int>) { - println!("{}, {}", managed_ip, device.get(&"interfaces".to_string())); + println!("{}, {}", managed_ip, device["interfaces".to_string()]); } pub fn main() {} diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs index 7228f12c030..62104f2dc23 100644 --- a/src/test/run-pass/issue-2804.rs +++ b/src/test/run-pass/issue-2804.rs @@ -57,9 +57,9 @@ fn add_interface(_store: int, managed_ip: String, data: json::Json) -> (String, fn add_interfaces(store: int, managed_ip: String, device: HashMap<String, json::Json>) -> Vec<(String, object)> { - match device.get(&"interfaces".to_string()) + match device["interfaces".to_string()] { - &json::List(ref interfaces) => + json::List(ref interfaces) => { interfaces.iter().map(|interface| { add_interface(store, managed_ip.clone(), (*interface).clone()) @@ -68,7 +68,7 @@ fn add_interfaces(store: int, managed_ip: String, device: HashMap<String, json:: _ => { println!("Expected list for {} interfaces, found {}", managed_ip, - device.get(&"interfaces".to_string())); + device["interfaces".to_string()]); Vec::new() } } diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index 01bfdddd285..1964001cebd 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -69,7 +69,7 @@ fn read_board_grid<rdr:'static + io::Reader>(mut input: rdr) row.push(square_from_char(*c as char)) } grid.push(row); - let width = grid.get(0).len(); + let width = grid[0].len(); for row in grid.iter() { assert!(row.len() == width) } grid } diff --git a/src/test/run-pass/issue-2989.rs b/src/test/run-pass/issue-2989.rs index c88f8b42d42..d625f6bcf92 100644 --- a/src/test/run-pass/issue-2989.rs +++ b/src/test/run-pass/issue-2989.rs @@ -24,7 +24,7 @@ fn to_bools(bitv: Storage) -> Vec<bool> { Vec::from_fn(8, |i| { let w = i / 64; let b = i % 64; - let x = 1u64 & (*bitv.storage.get(w) >> b); + let x = 1u64 & (bitv.storage[w] >> b); x == 1u64 }) } @@ -36,7 +36,7 @@ pub fn main() { let bools2 = to_bools(Storage{storage: vec!(0b01100100)}); for i in range(0u, 8) { - println!("{} => {} vs {}", i, *bools.get(i), *bools2.get(i)); + println!("{} => {} vs {}", i, bools[i], bools2[i]); } assert_eq!(bools, bools2); diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index 61dd2ea2a05..2e0159af984 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -23,7 +23,7 @@ fn foo(name: String, samples_chan: Sender<Msg>) { let mut samples_chan = samples_chan; let callback: SamplesFn = proc(buffer) { for i in range(0u, buffer.len()) { - println!("{}: {}", i, *buffer.get(i)) + println!("{}: {}", i, buffer[i]) } }; samples_chan.send(GetSamples(name.clone(), callback)); diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs index 8bf87e7f483..be75c723042 100644 --- a/src/test/run-pass/issue-5521.rs +++ b/src/test/run-pass/issue-5521.rs @@ -17,7 +17,7 @@ fn bar(a: foo::map) { if false { fail!(); } else { - let _b = a.get(&2); + let _b = &(*a)[2]; } } diff --git a/src/test/run-pass/issue-7660.rs b/src/test/run-pass/issue-7660.rs index 9a4b3bf0e54..8a953cea904 100644 --- a/src/test/run-pass/issue-7660.rs +++ b/src/test/run-pass/issue-7660.rs @@ -21,6 +21,6 @@ pub fn main() { let mut m: HashMap<int, A> = HashMap::new(); m.insert(1, A(0, 0)); - let A(ref _a, ref _b) = *m.get(&1); - let (a, b) = match *m.get(&1) { A(ref _a, ref _b) => (_a, _b) }; + let A(ref _a, ref _b) = m[1]; + let (a, b) = match m[1] { A(ref _a, ref _b) => (_a, _b) }; } diff --git a/src/test/run-pass/issue-9259.rs b/src/test/run-pass/issue-9259.rs index 2818b824969..0fe520e59d6 100644 --- a/src/test/run-pass/issue-9259.rs +++ b/src/test/run-pass/issue-9259.rs @@ -19,5 +19,5 @@ pub fn main() { a: &["test".to_string()], b: Some(b), }; - assert_eq!(a.b.get_ref()[0].as_slice(), "foo"); + assert_eq!(a.b.as_ref().unwrap()[0].as_slice(), "foo"); } diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/run-pass/match-vec-rvalue.rs index 70c3b386a8a..0f058086add 100644 --- a/src/test/run-pass/match-vec-rvalue.rs +++ b/src/test/run-pass/match-vec-rvalue.rs @@ -15,9 +15,9 @@ pub fn main() { match vec!(1i, 2i, 3i) { x => { assert_eq!(x.len(), 3); - assert_eq!(*x.get(0), 1); - assert_eq!(*x.get(1), 2); - assert_eq!(*x.get(2), 3); + assert_eq!(x[0], 1); + assert_eq!(x[1], 2); + assert_eq!(x[2], 3); } } } diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index 783dc32426a..4f9e573ccff 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -18,7 +18,7 @@ impl<A> vec_monad<A> for Vec<A> { fn bind<B>(&self, f: |&A| -> Vec<B> ) -> Vec<B> { let mut r = Vec::new(); for elt in self.iter() { - r.push_all_move(f(elt)); + r.extend(f(elt).into_iter()); } r } diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/run-pass/move-arg-2-unique.rs index ac90f8f6ecf..29fd070fc19 100644 --- a/src/test/run-pass/move-arg-2-unique.rs +++ b/src/test/run-pass/move-arg-2-unique.rs @@ -9,7 +9,7 @@ // except according to those terms. -fn test(foo: Box<Vec<int>> ) { assert!((*foo.get(0) == 10)); } +fn test(foo: Box<Vec<int>> ) { assert!(((*foo)[0] == 10)); } pub fn main() { let x = box vec!(10); diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/run-pass/move-arg-2.rs index 840a3c2a6ee..0f3d0baecbe 100644 --- a/src/test/run-pass/move-arg-2.rs +++ b/src/test/run-pass/move-arg-2.rs @@ -9,7 +9,7 @@ // except according to those terms. -fn test(foo: Box<Vec<int>>) { assert!((*foo.get(0) == 10)); } +fn test(foo: Box<Vec<int>>) { assert!(((*foo)[0] == 10)); } pub fn main() { let x = box vec!(10); diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs index 437f35d182b..a21bb489d16 100644 --- a/src/test/run-pass/newtype-polymorphic.rs +++ b/src/test/run-pass/newtype-polymorphic.rs @@ -26,8 +26,8 @@ pub fn main() { let mv = myvec(vec!(1i, 2, 3)); let mv_clone = mv.clone(); let mv_clone = myvec_deref(mv_clone); - assert_eq!(*mv_clone.get(1), 2); + assert_eq!(mv_clone[1], 2); assert_eq!(myvec_elt(mv.clone()), 1); let myvec(v) = mv; - assert_eq!(*v.get(2), 3); + assert_eq!(v[2], 3); } diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index 0c66b139e7c..9d7130ecb8c 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -44,7 +44,7 @@ macro_rules! check_option { assert!(option::None::<$T>.is_none()); let e = $e; let s_ = option::Some::<$T>(e); - let $v = s_.get_ref(); + let $v = s_.as_ref().unwrap(); $chk }} } diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs index 9ca6598b47c..ab3d39e2733 100644 --- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs +++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs @@ -35,6 +35,6 @@ pub fn main() { ); for i in range(0u, foos.len()) { - assert_eq!(i, foos.get(i).foo()); + assert_eq!(i, foos[i].foo()); } } diff --git a/src/test/run-pass/overloaded-deref.rs b/src/test/run-pass/overloaded-deref.rs index 96cf3102a42..cdd56f64d27 100644 --- a/src/test/run-pass/overloaded-deref.rs +++ b/src/test/run-pass/overloaded-deref.rs @@ -46,7 +46,7 @@ pub fn main() { let v = Rc::new(RefCell::new(vec!(1i, 2, 3))); *(*(*v).borrow_mut()).get_mut(0) = 3; *(*(*v).borrow_mut()).get_mut(1) += 3; - assert_eq!((*(*(*v).borrow()).get(0), - *(*(*v).borrow()).get(1), - *(*(*v).borrow()).get(2)), (3, 5, 3)); + assert_eq!(((*(*v).borrow())[0], + (*(*v).borrow())[1], + (*(*v).borrow())[2]), (3, 5, 3)); } diff --git a/src/test/run-pass/process-spawn-with-unicode-params.rs b/src/test/run-pass/process-spawn-with-unicode-params.rs index f04bc62bf7f..9716d79f4c8 100644 --- a/src/test/run-pass/process-spawn-with-unicode-params.rs +++ b/src/test/run-pass/process-spawn-with-unicode-params.rs @@ -53,12 +53,14 @@ fn main() { // make a separate directory for the child drop(fs::mkdir(&cwd, io::USER_RWX).is_ok()); assert!(fs::copy(&my_path, &child_path).is_ok()); + let mut my_env = my_env; + my_env.push(env); // run child let p = Command::new(&child_path) .arg(arg) .cwd(&cwd) - .env_set_all(my_env.append_one(env).as_slice()) + .env_set_all(my_env.as_slice()) .spawn().unwrap().wait_with_output().unwrap(); // display the output @@ -74,7 +76,7 @@ fn main() { assert!(my_cwd.ends_with_path(&Path::new(child_dir))); // check arguments - assert_eq!(my_args.get(1).as_slice(), arg); + assert_eq!(my_args[1].as_slice(), arg); // check environment variable assert!(my_env.contains(&env)); diff --git a/src/test/run-pass/pure-sum.rs b/src/test/run-pass/pure-sum.rs index 60eb3f9debd..3b2897cf3a6 100644 --- a/src/test/run-pass/pure-sum.rs +++ b/src/test/run-pass/pure-sum.rs @@ -15,7 +15,7 @@ fn sums_to(v: Vec<int> , sum: int) -> bool { let mut i = 0u; let mut sum0 = 0; while i < v.len() { - sum0 += *v.get(i); + sum0 += v[i]; i += 1u; } return sum0 == sum; @@ -25,7 +25,7 @@ fn sums_to_using_uniq(v: Vec<int> , sum: int) -> bool { let mut i = 0u; let mut sum0 = box 0; while i < v.len() { - *sum0 += *v.get(i); + *sum0 += v[i]; i += 1u; } return *sum0 == sum; @@ -35,7 +35,7 @@ fn sums_to_using_rec(v: Vec<int> , sum: int) -> bool { let mut i = 0u; let mut sum0 = F {f: 0}; while i < v.len() { - sum0.f += *v.get(i); + sum0.f += v[i]; i += 1u; } return sum0.f == sum; @@ -47,7 +47,7 @@ fn sums_to_using_uniq_rec(v: Vec<int> , sum: int) -> bool { let mut i = 0u; let mut sum0 = F {f: box 0}; while i < v.len() { - *sum0.f += *v.get(i); + *sum0.f += v[i]; i += 1u; } return *sum0.f == sum; diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/run-pass/regions-dependent-addr-of.rs index 252c0b5578a..68a451b62ac 100644 --- a/src/test/run-pass/regions-dependent-addr-of.rs +++ b/src/test/run-pass/regions-dependent-addr-of.rs @@ -42,7 +42,7 @@ fn get_v2(a: &A, i: uint) -> &int { fn get_v3(a: &A, i: uint) -> &int { let foo = &a.value; - foo.v3.get(i) + &foo.v3[i] } fn get_v4(a: &A, _i: uint) -> &int { @@ -97,7 +97,7 @@ pub fn main() { assert_eq!(*p, a.value.v2[1]); let p = get_v3(&a, 1); - assert_eq!(*p, *a.value.v3.get(1)); + assert_eq!(*p, a.value.v3[1]); let p = get_v4(&a, 1); assert_eq!(*p, a.value.v4.f); diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/run-pass/regions-infer-borrow-scope-view.rs index c4e0e3bb4fc..ce9edb5678a 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-view.rs +++ b/src/test/run-pass/regions-infer-borrow-scope-view.rs @@ -15,5 +15,5 @@ pub fn main() { let v = vec!(1i, 2, 3); let x = view(v.as_slice()); let y = view(x.as_slice()); - assert!((*v.get(0) == x[0]) && (*v.get(0) == y[0])); + assert!((v[0] == x[0]) && (v[0] == y[0])); } diff --git a/src/test/run-pass/running-with-no-runtime.rs b/src/test/run-pass/running-with-no-runtime.rs index 3f559df4b7e..d0762d1f3d8 100644 --- a/src/test/run-pass/running-with-no-runtime.rs +++ b/src/test/run-pass/running-with-no-runtime.rs @@ -41,7 +41,7 @@ fn start(argc: int, argv: *const *const u8) -> int { fn main() { let args = os::args(); - let me = args.get(0).as_slice(); + let me = args[0].as_slice(); let x: &[u8] = &[1u8]; pass(Command::new(me).arg(x).output().unwrap()); diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs index 1078359dc14..65928fd7bf3 100644 --- a/src/test/run-pass/size-and-align.rs +++ b/src/test/run-pass/size-and-align.rs @@ -11,7 +11,7 @@ enum clam<T> { a(T, int), b, } fn uhoh<T>(v: Vec<clam<T>> ) { - match *v.get(1) { + match v[1] { a::<T>(ref _t, ref u) => { println!("incorrect"); println!("{}", u); diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index d0dacc2ff7a..ff6e0e4bbc9 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -63,9 +63,9 @@ pub fn main() { assert_eq!((vec!(1i)).length_().str(), "1".to_string()); let vect = vec!(3i, 4).map_(|a| *a + 4); - assert_eq!(*vect.get(0), 7); + assert_eq!(vect[0], 7); let vect = (vec!(3i, 4)).map_::<uint>(|a| *a as uint + 4u); - assert_eq!(*vect.get(0), 7u); + assert_eq!(vect[0], 7u); let mut x = 0u; 10u.multi(|_n| x += 2u ); assert_eq!(x, 20u); diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs index 7789fe5abb4..4eb9274551f 100644 --- a/src/test/run-pass/swap-2.rs +++ b/src/test/run-pass/swap-2.rs @@ -13,10 +13,10 @@ use std::mem::swap; pub fn main() { let mut a: Vec<int> = vec!(0, 1, 2, 3, 4, 5, 6); a.as_mut_slice().swap(2, 4); - assert_eq!(*a.get(2), 4); - assert_eq!(*a.get(4), 2); + assert_eq!(a[2], 4); + assert_eq!(a[4], 2); let mut n = 42; swap(&mut n, a.get_mut(0)); - assert_eq!(*a.get(0), 42); + assert_eq!(a[0], 42); assert_eq!(n, 0); } diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index d45e7a20c3b..a6cc8c463e8 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -29,9 +29,9 @@ fn test_vec() { let v0: Vec<int> = vec!(0, 1, 2); tx.send(v0); let v1 = rx.recv(); - assert_eq!(*v1.get(0), 0); - assert_eq!(*v1.get(1), 1); - assert_eq!(*v1.get(2), 2); + assert_eq!(v1[0], 0); + assert_eq!(v1[1], 1); + assert_eq!(v1[2], 2); } fn test_str() { diff --git a/src/test/run-pass/trait-with-bounds-default.rs b/src/test/run-pass/trait-with-bounds-default.rs index ec9f666eb19..6b2c5093c83 100644 --- a/src/test/run-pass/trait-with-bounds-default.rs +++ b/src/test/run-pass/trait-with-bounds-default.rs @@ -32,7 +32,7 @@ impl Getter<int> for int { } impl<T: Clone> Getter<T> for Option<T> { - fn do_get(&self) -> T { self.get_ref().clone() } + fn do_get(&self) -> T { self.as_ref().unwrap().clone() } } diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/run-pass/type-use-i1-versus-i8.rs index 97bf9e9e8e2..99c68ac8100 100644 --- a/src/test/run-pass/type-use-i1-versus-i8.rs +++ b/src/test/run-pass/type-use-i1-versus-i8.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::mem; +use std::ptr; pub fn main() { unsafe { let mut x: bool = false; // this line breaks it - mem::overwrite(&mut x, false); + ptr::write(&mut x, false); } } diff --git a/src/test/run-pass/ufcs-explicit-self.rs b/src/test/run-pass/ufcs-explicit-self.rs index 9ffb56c516a..b96820eee14 100644 --- a/src/test/run-pass/ufcs-explicit-self.rs +++ b/src/test/run-pass/ufcs-explicit-self.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::owned::Box; - struct Foo { f: int, } diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/run-pass/unique-autoderef-index.rs index ec328d65ac8..f9bd5114e7d 100644 --- a/src/test/run-pass/unique-autoderef-index.rs +++ b/src/test/run-pass/unique-autoderef-index.rs @@ -11,5 +11,5 @@ pub fn main() { let i = box vec!(100i); - assert_eq!(*i.get(0), 100i); + assert_eq!((*i)[0], 100i); } diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/run-pass/unique-in-vec-copy.rs index fda3c53bdf4..33a28ddb2fc 100644 --- a/src/test/run-pass/unique-in-vec-copy.rs +++ b/src/test/run-pass/unique-in-vec-copy.rs @@ -13,12 +13,12 @@ pub fn main() { let mut a = vec!(box 10i); let b = a.clone(); - assert_eq!(**a.get(0), 10); - assert_eq!(**b.get(0), 10); + assert_eq!(*a[0], 10); + assert_eq!(*b[0], 10); // This should only modify the value in a, not b **a.get_mut(0) = 20; - assert_eq!(**a.get(0), 20); - assert_eq!(**b.get(0), 10); + assert_eq!(*a[0], 20); + assert_eq!(*b[0], 10); } diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/run-pass/unique-in-vec.rs index b7029ab38bc..0f8527664b9 100644 --- a/src/test/run-pass/unique-in-vec.rs +++ b/src/test/run-pass/unique-in-vec.rs @@ -10,5 +10,5 @@ pub fn main() { let vect = vec!(box 100i); - assert!(*vect.get(0) == box 100); + assert!(vect[0] == box 100); } diff --git a/src/test/run-pass/vec-concat.rs b/src/test/run-pass/vec-concat.rs index a0400a9dcc5..02a791e7975 100644 --- a/src/test/run-pass/vec-concat.rs +++ b/src/test/run-pass/vec-concat.rs @@ -13,9 +13,10 @@ use std::vec; pub fn main() { let a: Vec<int> = vec!(1, 2, 3, 4, 5); let b: Vec<int> = vec!(6, 7, 8, 9, 0); - let v: Vec<int> = a.append(b.as_slice()); - println!("{}", *v.get(9)); - assert_eq!(*v.get(0), 1); - assert_eq!(*v.get(7), 8); - assert_eq!(*v.get(9), 0); + let mut v: Vec<int> = a; + v.push_all(b.as_slice()); + println!("{}", v[9]); + assert_eq!(v[0], 1); + assert_eq!(v[7], 8); + assert_eq!(v[9], 0); } diff --git a/src/test/run-pass/vec-growth.rs b/src/test/run-pass/vec-growth.rs index 08f9b3c176b..d5e5f94d261 100644 --- a/src/test/run-pass/vec-growth.rs +++ b/src/test/run-pass/vec-growth.rs @@ -15,9 +15,9 @@ pub fn main() { v.push(3i); v.push(4i); v.push(5i); - assert_eq!(*v.get(0), 1); - assert_eq!(*v.get(1), 2); - assert_eq!(*v.get(2), 3); - assert_eq!(*v.get(3), 4); - assert_eq!(*v.get(4), 5); + assert_eq!(v[0], 1); + assert_eq!(v[1], 2); + assert_eq!(v[2], 3); + assert_eq!(v[3], 4); + assert_eq!(v[4], 5); } diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/run-pass/vec-late-init.rs index 118095b6c9a..dec0b3eaa78 100644 --- a/src/test/run-pass/vec-late-init.rs +++ b/src/test/run-pass/vec-late-init.rs @@ -12,5 +12,5 @@ pub fn main() { let mut later: Vec<int> ; if true { later = vec!(1); } else { later = vec!(2); } - println!("{}", *later.get(0)); + println!("{}", later[0]); } diff --git a/src/test/run-pass/vec.rs b/src/test/run-pass/vec.rs index c5031a6e51f..5e19868de1d 100644 --- a/src/test/run-pass/vec.rs +++ b/src/test/run-pass/vec.rs @@ -11,12 +11,12 @@ pub fn main() { let v: Vec<int> = vec!(10, 20); - assert_eq!(*v.get(0), 10); - assert_eq!(*v.get(1), 20); + assert_eq!(v[0], 10); + assert_eq!(v[1], 20); let mut x: uint = 0; - assert_eq!(*v.get(x), 10); - assert_eq!(*v.get(x + 1), 20); + assert_eq!(v[x], 10); + assert_eq!(v[x + 1], 20); x = x + 1; - assert_eq!(*v.get(x), 20); - assert_eq!(*v.get(x - 1), 10); + assert_eq!(v[x], 20); + assert_eq!(v[x - 1], 10); } |