Skip to content

Commit 4688aad

Browse files
committed
Update tests to use ?Sized
1 parent e656081 commit 4688aad

9 files changed

+34
-33
lines changed

src/test/run-pass/dst-raw.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Trait for A {
2323
}
2424
}
2525

26-
struct Foo<Sized? T> {
26+
struct Foo<T: ?Sized> {
2727
f: T
2828
}
2929

src/test/run-pass/dst-struct-sole.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// As dst-struct.rs, but the unsized field is the only field in the struct.
1212

13-
struct Fat<Sized? T> {
13+
struct Fat<T: ?Sized> {
1414
ptr: T
1515
}
1616

src/test/run-pass/dst-struct.rs

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

11-
struct Fat<Sized? T> {
11+
struct Fat<T: ?Sized> {
1212
f1: int,
1313
f2: &'static str,
1414
ptr: T

src/test/run-pass/dst-trait.rs

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

11-
struct Fat<Sized? T> {
11+
struct Fat<T: ?Sized> {
1212
f1: int,
1313
f2: &'static str,
1414
ptr: T

src/test/run-pass/issue-15155.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct IndirectBlah { x: Box<IndirectTraitWithSend> }
2222
impl TraitWithSend for IndirectBlah {}
2323
impl IndirectTraitWithSend for IndirectBlah {}
2424

25-
fn test_trait<Sized? T: Send>() { println!("got here!") }
25+
fn test_trait<T: Send + ?Sized>() { println!("got here!") }
2626

2727
fn main() {
2828
test_trait::<TraitWithSend>();

src/test/run-pass/issue-17361.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
// Test that astconv doesn't forget about mutability of &mut str
1212

1313
fn main() {
14-
fn foo<Sized? T>(_: &mut T) {}
14+
fn foo<T: ?Sized>(_: &mut T) {}
1515
let _f: fn(&mut str) = foo;
1616
}

src/test/run-pass/method-recursive-blanket-impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use std::kinds::Sized;
1717

1818
// Note: this must be generic for the problem to show up
19-
trait Foo<A> for Sized? {
19+
trait Foo<A> for ?Sized {
2020
fn foo(&self);
2121
}
2222

src/test/run-pass/unsized.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@
1010
//
1111
// ignore-lexer-test FIXME #15879
1212

13-
// Test syntax checks for `Sized?` syntax.
13+
// Test syntax checks for `?Sized` syntax.
1414

15-
trait T1 for Sized? {}
16-
pub trait T2 for Sized? {}
17-
trait T3<X: T1> for Sized?: T2 {}
18-
trait T4<Sized? X> {}
19-
trait T5<Sized? X, Y> {}
20-
trait T6<Y, Sized? X> {}
21-
trait T7<Sized? X, Sized? Y> {}
22-
trait T8<Sized? X: T2> {}
23-
struct S1<Sized? X>;
24-
enum E<Sized? X> {}
25-
impl <Sized? X> T1 for S1<X> {}
26-
fn f<Sized? X>() {}
27-
type TT<Sized? T> = T;
15+
trait T1 for ?Sized {}
16+
pub trait T2 for ?Sized {}
17+
trait T3<X: T1> for ?Sized: T2 {}
18+
trait T4<X: ?Sized> {}
19+
trait T5<X: ?Sized, Y> {}
20+
trait T6<Y, X: ?Sized> {}
21+
trait T7<X: ?Sized, Y: ?Sized> {}
22+
trait T8<X: ?Sized+T2> {}
23+
trait T9<X: T2 + ?Sized> {}
24+
struct S1<X: ?Sized>;
25+
enum E<X: ?Sized> {}
26+
impl <X: ?Sized> T1 for S1<X> {}
27+
fn f<X: ?Sized>() {}
28+
type TT<T: ?Sized> = T;
2829

2930
pub fn main() {
3031
}

src/test/run-pass/unsized2.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// Test sized-ness checking in substitution.
1414

1515
// Unbounded.
16-
fn f1<Sized? X>(x: &X) {
16+
fn f1<X: ?Sized>(x: &X) {
1717
f1::<X>(x);
1818
}
1919
fn f2<X>(x: &X) {
@@ -22,8 +22,8 @@ fn f2<X>(x: &X) {
2222
}
2323

2424
// Bounded.
25-
trait T for Sized? {}
26-
fn f3<Sized? X: T>(x: &X) {
25+
trait T for ?Sized {}
26+
fn f3<X: T+?Sized>(x: &X) {
2727
f3::<X>(x);
2828
}
2929
fn f4<X: T>(x: &X) {
@@ -32,7 +32,7 @@ fn f4<X: T>(x: &X) {
3232
}
3333

3434
// Self type.
35-
trait T2 for Sized? {
35+
trait T2 for ?Sized {
3636
fn f() -> Box<Self>;
3737
}
3838
struct S;
@@ -41,22 +41,22 @@ impl T2 for S {
4141
box S
4242
}
4343
}
44-
fn f5<Sized? X: T2>(x: &X) {
44+
fn f5<X: ?Sized+T2>(x: &X) {
4545
let _: Box<X> = T2::f();
4646
}
4747
fn f6<X: T2>(x: &X) {
4848
let _: Box<X> = T2::f();
4949
}
5050

51-
trait T3 for Sized? {
51+
trait T3 for ?Sized {
5252
fn f() -> Box<Self>;
5353
}
5454
impl T3 for S {
5555
fn f() -> Box<S> {
5656
box S
5757
}
5858
}
59-
fn f7<Sized? X: T3>(x: &X) {
59+
fn f7<X: ?Sized+T3>(x: &X) {
6060
// This is valid, but the unsized bound on X is irrelevant because any type
6161
// which implements T3 must have statically known size.
6262
let _: Box<X> = T3::f();
@@ -66,7 +66,7 @@ trait T4<X> {
6666
fn m1(x: &T4<X>);
6767
fn m2(x: &T5<X>);
6868
}
69-
trait T5<Sized? X> {
69+
trait T5<X: ?Sized> {
7070
// not an error (for now)
7171
fn m1(x: &T4<X>);
7272
fn m2(x: &T5<X>);
@@ -76,21 +76,21 @@ trait T6<X: T> {
7676
fn m1(x: &T4<X>);
7777
fn m2(x: &T5<X>);
7878
}
79-
trait T7<Sized? X: T> {
79+
trait T7<X: ?Sized+T> {
8080
// not an error (for now)
8181
fn m1(x: &T4<X>);
8282
fn m2(x: &T5<X>);
8383
}
8484

8585
// The last field in a struct or variant may be unsized
86-
struct S2<Sized? X> {
86+
struct S2<X: ?Sized> {
8787
f: X,
8888
}
89-
struct S3<Sized? X> {
89+
struct S3<X: ?Sized> {
9090
f1: int,
9191
f2: X,
9292
}
93-
enum E<Sized? X> {
93+
enum E<X: ?Sized> {
9494
V1(X),
9595
V2{x: X},
9696
V3(int, X),

0 commit comments

Comments
 (0)