Skip to content

Commit da41e58

Browse files
committed
Fix fallout in tests
1 parent 0c6f067 commit da41e58

File tree

125 files changed

+285
-285
lines changed

Some content is hidden

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

125 files changed

+285
-285
lines changed

src/test/compile-fail/associated-types-unsized.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trait Get {
1414
}
1515

1616
fn foo<T:Get>(t: T) {
17-
let x = t.get(); //~ ERROR the trait `core::marker::Sized` is not implemented
17+
let x = t.get(); //~ ERROR the trait `std::marker::Sized` is not implemented
1818
}
1919

2020
fn main() {

src/test/compile-fail/bad-const-type.rs

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

1111
static i: String = 10;
1212
//~^ ERROR mismatched types
13-
//~| expected `collections::string::String`
13+
//~| expected `std::string::String`
1414
//~| found `_`
15-
//~| expected struct `collections::string::String`
15+
//~| expected struct `std::string::String`
1616
//~| found integral variable
1717
fn main() { println!("{}", i); }

src/test/compile-fail/bad-method-typaram-kind.rs

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

1111
fn foo<T:'static>() {
12-
1.bar::<T>(); //~ ERROR `core::marker::Send` is not implemented
12+
1.bar::<T>(); //~ ERROR `std::marker::Send` is not implemented
1313
}
1414

1515
trait bar {

src/test/compile-fail/bad-sized.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trait Trait {}
1212

1313
pub fn main() {
1414
let x: Vec<Trait + Sized> = Vec::new();
15-
//~^ ERROR the trait `core::marker::Sized` is not implemented
16-
//~| ERROR the trait `core::marker::Sized` is not implemented
17-
//~| ERROR the trait `core::marker::Sized` is not implemented
15+
//~^ ERROR the trait `std::marker::Sized` is not implemented
16+
//~| ERROR the trait `std::marker::Sized` is not implemented
17+
//~| ERROR the trait `std::marker::Sized` is not implemented
1818
}

src/test/compile-fail/binop-bitxor-str.rs

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

11-
// error-pattern:`^` cannot be applied to type `collections::string::String`
11+
// error-pattern:`^` cannot be applied to type `std::string::String`
1212

1313
fn main() { let x = "a".to_string() ^ "b".to_string(); }

src/test/compile-fail/builtin-superkinds-double-superkind.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
trait Foo : Send+Sync { }
1515

16-
impl <T: Sync+'static> Foo for (T,) { } //~ ERROR the trait `core::marker::Send` is not implemented
16+
impl <T: Sync+'static> Foo for (T,) { } //~ ERROR the trait `std::marker::Send` is not implemented
1717

18-
impl <T: Send> Foo for (T,T) { } //~ ERROR the trait `core::marker::Sync` is not implemented
18+
impl <T: Send> Foo for (T,T) { } //~ ERROR the trait `std::marker::Sync` is not implemented
1919

2020
impl <T: Send+Sync> Foo for (T,T,T) { } // (ok)
2121

src/test/compile-fail/builtin-superkinds-in-metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ struct X<T>(T);
2222
impl <T:Sync> RequiresShare for X<T> { }
2323

2424
impl <T:Sync+'static> RequiresRequiresShareAndSend for X<T> { }
25-
//~^ ERROR the trait `core::marker::Send` is not implemented
25+
//~^ ERROR the trait `std::marker::Send` is not implemented
2626

2727
fn main() { }

src/test/compile-fail/builtin-superkinds-simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
trait Foo : Send { }
1515

1616
impl Foo for std::rc::Rc<i8> { }
17-
//~^ ERROR the trait `core::marker::Send` is not implemented
17+
//~^ ERROR the trait `std::marker::Send` is not implemented
1818

1919
fn main() { }

src/test/compile-fail/builtin-superkinds-typaram-not-send.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
trait Foo : Send { }
1414

15-
impl <T: Sync+'static> Foo for T { } //~ ERROR the trait `core::marker::Send` is not implemented
15+
impl <T: Sync+'static> Foo for T { } //~ ERROR the trait `std::marker::Send` is not implemented
1616

1717
fn main() { }

src/test/compile-fail/cast-rfc0401.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fn main()
9191
let _ = 42usize as *const [u8]; //~ ERROR casting
9292
let _ = v as *const [u8]; //~ ERROR cannot cast
9393
let _ = fat_v as *const Foo;
94-
//~^ ERROR `core::marker::Sized` is not implemented for the type `[u8]`
94+
//~^ ERROR `std::marker::Sized` is not implemented for the type `[u8]`
9595
//~^^ HELP run `rustc --explain E0277` to see a detailed explanation
9696
//~^^^ NOTE `[u8]` does not have a constant size known at compile-time
9797
//~^^^^ NOTE required for the cast to the object type `Foo`
@@ -106,7 +106,7 @@ fn main()
106106

107107
let a : *const str = "hello";
108108
let _ = a as *const Foo;
109-
//~^ ERROR `core::marker::Sized` is not implemented for the type `str`
109+
//~^ ERROR `std::marker::Sized` is not implemented for the type `str`
110110
//~^^ HELP run `rustc --explain E0277` to see a detailed explanation
111111
//~^^^ NOTE `str` does not have a constant size known at compile-time
112112
//~^^^^ NOTE required for the cast to the object type `Foo`

0 commit comments

Comments
 (0)