Skip to content

Commit bd968ac

Browse files
committed
Auto merge of #120524 - Nadrieril:rollup-67952ib, r=Nadrieril
Rollup of 9 pull requests Successful merges: - #120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test) - #120321 (pattern_analysis: cleanup the contexts) - #120355 (document `FromIterator for Vec` allocation behaviors) - #120430 (std: thread_local::register_dtor fix proposal for FreeBSD.) - #120469 (Provide more context on derived obligation error primary label) - #120472 (Make duplicate lang items fatal) - #120490 (Don't hash lints differently to non-lints.) - #120495 (Remove the `abi_amdgpu_kernel` feature) - #120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 35f0968 + 272570c commit bd968ac

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

tests/ui/same_name_method.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ mod should_lint {
7474
impl S {
7575
fn foo() {}
7676
//~^ ERROR: method's name is the same as an existing method in a trait
77+
//~| ERROR: method's name is the same as an existing method in a trait
7778
}
7879

7980
impl T1 for S {}

tests/ui/same_name_method.stderr

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,22 @@ LL | fn foo() {}
5656
| ^^^^^^^^^^^
5757
|
5858
note: existing `foo` defined here
59-
--> $DIR/same_name_method.rs:79:9
59+
--> $DIR/same_name_method.rs:80:9
6060
|
6161
LL | impl T1 for S {}
6262
| ^^^^^^^^^^^^^^^^
6363

64-
error: aborting due to 5 previous errors
64+
error: method's name is the same as an existing method in a trait
65+
--> $DIR/same_name_method.rs:75:13
66+
|
67+
LL | fn foo() {}
68+
| ^^^^^^^^^^^
69+
|
70+
note: existing `foo` defined here
71+
--> $DIR/same_name_method.rs:82:9
72+
|
73+
LL | impl T2 for S {}
74+
| ^^^^^^^^^^^^^^^^
75+
76+
error: aborting due to 6 previous errors
6577

0 commit comments

Comments
 (0)