diff --git a/src/test/compile-fail/estr-subtyping.rs b/src/test/compile-fail/estr-subtyping.rs index 7dc99074f72f..d99d29fb8108 100644 --- a/src/test/compile-fail/estr-subtyping.rs +++ b/src/test/compile-fail/estr-subtyping.rs @@ -8,26 +8,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[feature(managed_boxes)]; - -fn wants_box(x: @str) { } fn wants_uniq(x: ~str) { } fn wants_slice(x: &str) { } -fn has_box(x: @str) { - wants_box(x); - wants_uniq(x); //~ ERROR str storage differs: expected `~` but found `@` - wants_slice(x); -} - fn has_uniq(x: ~str) { - wants_box(x); //~ ERROR str storage differs: expected `@` but found `~` wants_uniq(x); wants_slice(x); } fn has_slice(x: &str) { - wants_box(x); //~ ERROR str storage differs: expected `@` but found `&` wants_uniq(x); //~ ERROR str storage differs: expected `~` but found `&` wants_slice(x); } diff --git a/src/test/compile-fail/lint-heap-memory.rs b/src/test/compile-fail/lint-heap-memory.rs index c02da1beeb73..0c19988bef42 100644 --- a/src/test/compile-fail/lint-heap-memory.rs +++ b/src/test/compile-fail/lint-heap-memory.rs @@ -25,7 +25,6 @@ fn main() { @[1]; //~ ERROR type uses managed //~^ ERROR type uses managed fn f(_: @Clone) {} //~ ERROR type uses managed - @""; //~ ERROR type uses managed //~^ ERROR type uses managed ~2; //~ ERROR type uses owned diff --git a/src/test/run-pass/auto-ref-slice-plus-ref.rs b/src/test/run-pass/auto-ref-slice-plus-ref.rs index eae791b6b08a..7bcf98c3f41b 100644 --- a/src/test/run-pass/auto-ref-slice-plus-ref.rs +++ b/src/test/run-pass/auto-ref-slice-plus-ref.rs @@ -34,7 +34,6 @@ pub fn main() { (&[1]).test_imm(); ("test").test_imm(); (~"test").test_imm(); - (@"test").test_imm(); (&"test").test_imm(); // FIXME: Other types of mutable vecs don't currently exist diff --git a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs index 77484b8da4a7..07a13e5395fc 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs @@ -11,8 +11,7 @@ #[feature(managed_boxes)]; pub fn main() { - let (&x, &y, &z) = (&3, &'a', &@"No pets!"); + let (&x, &y) = (&3, &'a'); assert_eq!(x, 3); assert_eq!(y, 'a'); - assert_eq!(z, @"No pets!"); } diff --git a/src/test/run-pass/borrowed-ptr-pattern.rs b/src/test/run-pass/borrowed-ptr-pattern.rs index 11751ed6ade3..7ccb40c8e7b3 100644 --- a/src/test/run-pass/borrowed-ptr-pattern.rs +++ b/src/test/run-pass/borrowed-ptr-pattern.rs @@ -17,5 +17,4 @@ fn foo(x: &T) -> T{ pub fn main() { assert_eq!(foo(&3), 3); assert_eq!(foo(&'a'), 'a'); - assert_eq!(foo(&@"Dogs rule, cats drool"), @"Dogs rule, cats drool"); } diff --git a/src/test/run-pass/estr-shared.rs b/src/test/run-pass/estr-shared.rs deleted file mode 100644 index 73837a46df70..000000000000 --- a/src/test/run-pass/estr-shared.rs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#[feature(managed_boxes)]; - -pub fn main() { - let _x : @str = @"hello"; -} diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs index 610cba1eb1fa..cc59ce5d8b24 100644 --- a/src/test/run-pass/ifmt.rs +++ b/src/test/run-pass/ifmt.rs @@ -58,7 +58,6 @@ pub fn main() { t!(format!("{}", 1.0f64), "1"); t!(format!("{}", "a"), "a"); t!(format!("{}", ~"a"), "a"); - t!(format!("{}", @"a"), "a"); t!(format!("{}", false), "false"); t!(format!("{}", 'a'), "a"); @@ -73,7 +72,6 @@ pub fn main() { t!(format!("{:X}", 10u), "A"); t!(format!("{:s}", "foo"), "foo"); t!(format!("{:s}", ~"foo"), "foo"); - t!(format!("{:s}", @"foo"), "foo"); t!(format!("{:p}", 0x1234 as *int), "0x1234"); t!(format!("{:p}", 0x1234 as *mut int), "0x1234"); t!(format!("{:d}", A), "aloha"); diff --git a/src/test/run-pass/issue-3574.rs b/src/test/run-pass/issue-3574.rs index eb59b3e12b61..ace27c5ea11f 100644 --- a/src/test/run-pass/issue-3574.rs +++ b/src/test/run-pass/issue-3574.rs @@ -26,5 +26,4 @@ pub fn main() { assert!(compare("foo", "foo")); assert!(compare(~"foo", ~"foo")); - assert!(compare(@"foo", @"foo")); } diff --git a/src/test/run-pass/issue-4092.rs b/src/test/run-pass/issue-4092.rs deleted file mode 100644 index 62174a70d07f..000000000000 --- a/src/test/run-pass/issue-4092.rs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#[feature(managed_boxes)]; - -use std::hashmap::HashMap; - -pub fn main() { - let mut x = HashMap::new(); - x.insert((@"abc", 0), 0); -} diff --git a/src/test/run-pass/match-borrowed_str.rs b/src/test/run-pass/match-borrowed_str.rs index acff2de548ee..b0f31f70f53c 100644 --- a/src/test/run-pass/match-borrowed_str.rs +++ b/src/test/run-pass/match-borrowed_str.rs @@ -43,19 +43,15 @@ fn g2(ref_1: &str, ref_2: &str) -> ~str { } pub fn main() { - assert_eq!(f1(@"a"), ~"found a"); assert_eq!(f1(~"b"), ~"found b"); assert_eq!(f1(&"c"), ~"not found"); assert_eq!(f1("d"), ~"not found"); - assert_eq!(f2(@"a"), ~"found a"); assert_eq!(f2(~"b"), ~"found b"); assert_eq!(f2(&"c"), ~"not found (c)"); assert_eq!(f2("d"), ~"not found (d)"); - assert_eq!(g1(@"a", @"b"), ~"found a,b"); assert_eq!(g1(~"b", ~"c"), ~"found b,c"); assert_eq!(g1(&"c", &"d"), ~"not found"); assert_eq!(g1("d", "e"), ~"not found"); - assert_eq!(g2(@"a", @"b"), ~"found a,b"); assert_eq!(g2(~"b", ~"c"), ~"found b,c"); assert_eq!(g2(&"c", &"d"), ~"not found (c, d)"); assert_eq!(g2("d", "e"), ~"not found (d, e)"); diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index acb7fe12360e..32803283bf94 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -79,7 +79,6 @@ pub fn main() { check_type!(~18: ~int); check_type!(@19: @int); check_type!(~"foo": ~str); - check_type!(@"bar": @str); check_type!(~[20, 22]: ~[int]); check_type!(@[]: @[int]); check_type!(@[24, 26]: @[int]); diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs index 228b91a4532c..5117d0849fb9 100644 --- a/src/test/run-pass/nullable-pointer-size.rs +++ b/src/test/run-pass/nullable-pointer-size.rs @@ -41,7 +41,6 @@ pub fn main() { check_type!(~int); check_type!(@int); check_type!(~str); - check_type!(@str); check_type!(~[int]); check_type!(@[int]); check_type!(extern fn()); diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 6dec5fdaa1cb..38000a43518b 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -180,9 +180,6 @@ impl TyVisitor for ptr_visit_adaptor { } fn visit_estr_box(&mut self) -> bool { - self.align_to::<@str>(); - if ! self.inner().visit_estr_box() { return false; } - self.bump_past::<@str>(); true } diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/run-pass/send_str_hashmap.rs index 1e3bd5897a9d..dc7e51c3c236 100644 --- a/src/test/run-pass/send_str_hashmap.rs +++ b/src/test/run-pass/send_str_hashmap.rs @@ -63,11 +63,6 @@ pub fn main() { assert_eq!(map.find_equiv(&(~"cde")), Some(&c)); assert_eq!(map.find_equiv(&(~"def")), Some(&d)); - assert_eq!(map.find_equiv(&(@"abc")), Some(&a)); - assert_eq!(map.find_equiv(&(@"bcd")), Some(&b)); - assert_eq!(map.find_equiv(&(@"cde")), Some(&c)); - assert_eq!(map.find_equiv(&(@"def")), Some(&d)); - assert_eq!(map.find_equiv(&SendStrStatic("abc")), Some(&a)); assert_eq!(map.find_equiv(&SendStrStatic("bcd")), Some(&b)); assert_eq!(map.find_equiv(&SendStrStatic("cde")), Some(&c));