Skip to content

Commit dac8883

Browse files
nikomatsakisGuillaumeGomez
authored andcommitted
fix some broken tests
1 parent 88e9430 commit dac8883

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

src/test/compile-fail/coercion-slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ fn main() {
1414
let _: &[i32] = [0];
1515
//~^ ERROR mismatched types
1616
//~| expected type `&[i32]`
17-
//~| found type `[i32; 1]`
17+
//~| found type `[{integer}; 1]`
1818
//~| expected &[i32], found array of 1 elements
1919
}

src/test/compile-fail/cross-borrow-trait.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ pub fn main() {
2222
//~| expected type `&Trait`
2323
//~| found type `Box<Trait>`
2424
//~| expected &Trait, found box
25-
//~^^^^ ERROR E0277
2625
}

src/test/compile-fail/dst-bad-coercions.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ pub fn main() {
2323
let x: *const S = &S;
2424
let y: &S = x; //~ ERROR mismatched types
2525
let y: &T = x; //~ ERROR mismatched types
26-
//~^ ERROR E0277
2726

2827
// Test that we cannot convert from *-ptr to &S and &T (mut version)
2928
let x: *mut S = &mut S;
3029
let y: &S = x; //~ ERROR mismatched types
3130
let y: &T = x; //~ ERROR mismatched types
32-
//~^ ERROR E0277
3331

3432
// Test that we cannot convert an immutable ptr to a mutable one using *-ptrs
3533
let x: &mut T = &S; //~ ERROR mismatched types

src/test/compile-fail/issue-13058.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
3636
fn main() {
3737
check((3, 5));
3838
//~^ ERROR mismatched types
39-
//~| HELP try with `&(3, 5)`
4039
}

0 commit comments

Comments
 (0)