Skip to content

Commit 90e9d8e

Browse files
committed
test: Remove Freeze / NoFreeze from tests
1 parent b4ddee6 commit 90e9d8e

16 files changed

+32
-117
lines changed

src/test/auxiliary/trait_superkinds_in_metadata.rs

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

1414
#[crate_type="lib"];
1515

16-
pub trait RequiresFreeze : Freeze { }
17-
pub trait RequiresRequiresFreezeAndSend : RequiresFreeze + Send { }
16+
pub trait RequiresShare : Share { }
17+
pub trait RequiresRequiresShareAndSend : RequiresShare + Send { }
1818
pub trait RequiresPod : Pod { }

src/test/compile-fail/borrowck-borrow-of-mut-base-ptr.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
// Mostly tests correctness of metadata.
1717

1818
extern crate trait_superkinds_in_metadata;
19-
use trait_superkinds_in_metadata::{RequiresRequiresFreezeAndSend, RequiresFreeze};
19+
use trait_superkinds_in_metadata::{RequiresRequiresShareAndSend, RequiresShare};
2020

2121
struct X<T>(T);
2222

23-
impl <T:Freeze> RequiresFreeze for X<T> { }
23+
impl <T:Share> RequiresShare for X<T> { }
2424

25-
impl <T:Freeze> RequiresRequiresFreezeAndSend for X<T> { } //~ ERROR cannot implement this trait
25+
impl <T:Share> RequiresRequiresShareAndSend for X<T> { } //~ ERROR cannot implement this trait
2626

2727
fn main() { }

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

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

1414
trait Foo : Send { }
1515

16-
impl <'a> Foo for &'a mut () { } //~ ERROR cannot implement this trait
17-
18-
trait Bar : Freeze { }
19-
20-
impl <'a> Bar for &'a mut () { } //~ ERROR cannot implement this trait
16+
impl <'a> Foo for &'a mut () { }
17+
//~^ ERROR which does not fulfill `Send`, cannot implement this trait
2118

2219
fn main() { }

src/test/compile-fail/closure-bounds-subtype.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
fn take_any(_: ||:) {
1313
}
1414

15-
fn take_const_owned(_: ||:Freeze+Send) {
15+
fn take_const_owned(_: ||:Share+Send) {
1616
}
1717

1818
fn give_any(f: ||:) {
@@ -21,7 +21,7 @@ fn give_any(f: ||:) {
2121

2222
fn give_owned(f: ||:Send) {
2323
take_any(f);
24-
take_const_owned(f); //~ ERROR expected bounds `Send+Freeze` but found bounds `Send`
24+
take_const_owned(f); //~ ERROR expected bounds `Send+Share` but found bounds `Send`
2525
}
2626

2727
fn main() {}

src/test/compile-fail/kindck-freeze.rs

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/test/compile-fail/mutable-enum-indirect.rs

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

1414
use std::kinds::marker;
1515

16-
enum Foo { A(marker::NoFreeze) }
16+
enum Foo { A(marker::NoShare) }
1717

18-
fn bar<T: Freeze>(_: T) {}
18+
fn bar<T: Share>(_: T) {}
1919

2020
fn main() {
21-
let x = A(marker::NoFreeze);
21+
let x = A(marker::NoShare);
2222
bar(&x); //~ ERROR type parameter with an incompatible type
2323
}

src/test/compile-fail/proc-bounds.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 is_send<T: Send>() {}
12-
fn is_freeze<T: Freeze>() {}
12+
fn is_freeze<T: Share>() {}
1313
fn is_static<T: 'static>() {}
1414

1515
fn main() {

src/test/compile-fail/trait-bounds-cant-coerce.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trait Foo {
1414
fn a(_x: ~Foo:Send) {
1515
}
1616

17-
fn c(x: ~Foo:Freeze+Send) {
17+
fn c(x: ~Foo:Share+Send) {
1818
a(x);
1919
}
2020

src/test/compile-fail/trait-bounds-sugar.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ fn a(_x: ~Foo) { // should be same as ~Foo:Send
1818
fn b(_x: &'static Foo) { // should be same as &'static Foo:'static
1919
}
2020

21-
fn c(x: ~Foo:Freeze) {
21+
fn c(x: ~Foo:Share) {
2222
a(x); //~ ERROR expected bounds `Send`
2323
}
2424

25-
fn d(x: &'static Foo:Freeze) {
25+
fn d(x: &'static Foo:Share) {
2626
b(x); //~ ERROR expected bounds `'static`
2727
}
2828

0 commit comments

Comments
 (0)