Skip to content

Commit 1f342a6

Browse files
committed
Test fixes from the rollup
1 parent 672d599 commit 1f342a6

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313

1414
trait C {}
1515
impl C { fn f() {} } //~ ERROR duplicate definitions with name `f`
16+
//~^ WARN: this was previously accepted
1617
impl C { fn f() {} }
1718
fn main() { }

src/test/compile-fail/feature-gate-dropck-ugeh.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ struct Foo<T> { data: Vec<T> }
2828
impl<T> Drop for Foo<T> {
2929
#[unsafe_destructor_blind_to_params] // This is the UGEH attribute
3030
//~^ ERROR unsafe_destructor_blind_to_params has been replaced
31+
//~^^ WARN: use of deprecated attribute
3132
fn drop(&mut self) { }
3233
}
3334

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0276]: impl has stricter requirements than trait
1+
error[E0276]: impl has stricter requirements than trait, #[deny(extra_requirement_in_impl)] on by default
22
--> $DIR/proj-outlives-region.rs:22:5
33
|
44
17 | fn foo() where T: 'a;
@@ -9,11 +9,6 @@ error[E0276]: impl has stricter requirements than trait
99
|
1010
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1111
= note: for more information, see issue #37166 <https://github.com/rust-lang/rust/issues/37166>
12-
note: lint level defined here
13-
--> $DIR/proj-outlives-region.rs:12:9
14-
|
15-
12 | #![deny(extra_requirement_in_impl)]
16-
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1712

1813
error: aborting due to previous error
1914

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0276]: impl has stricter requirements than trait
1+
error[E0276]: impl has stricter requirements than trait, #[deny(extra_requirement_in_impl)] on by default
22
--> $DIR/region-unrelated.rs:22:5
33
|
44
17 | fn foo() where T: 'a;
@@ -9,11 +9,6 @@ error[E0276]: impl has stricter requirements than trait
99
|
1010
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1111
= note: for more information, see issue #37166 <https://github.com/rust-lang/rust/issues/37166>
12-
note: lint level defined here
13-
--> $DIR/region-unrelated.rs:12:9
14-
|
15-
12 | #![deny(extra_requirement_in_impl)]
16-
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1712

1813
error: aborting due to previous error
1914

0 commit comments

Comments
 (0)