Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit be85c12

Browse files
committed
Change the trait_impls stdout file back, the `Display` impls have gotten changed back in the meantime it seems.
1 parent 310a4ad commit be85c12

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# NOTE: Keep in sync with nightly date on README
22
[toolchain]
3-
channel = "nightly-2022-02-16"
3+
channel = "nightly-2022-02-26"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/changes.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ impl PathChange {
202202

203203
let msg = format!("path changes to `{}`", self.name.0);
204204
let mut builder = if cat == Breaking {
205-
session.struct_span_err(self.def_span, &msg)
205+
session
206+
.struct_span_err(self.def_span, &msg)
207+
.forget_guarantee()
206208
} else {
207209
session.struct_span_warn(self.def_span, &msg)
208210
};
@@ -903,7 +905,9 @@ impl<'tcx> Change<'tcx> {
903905

904906
let msg = format!("{} changes in {}", self.max, self.name);
905907
let mut builder = if self.max == Breaking {
906-
session.struct_span_err(self.new_span, &msg)
908+
session
909+
.struct_span_err(self.new_span, &msg)
910+
.forget_guarantee()
907911
} else {
908912
session.struct_span_warn(self.new_span, &msg)
909913
};

tests/cases/trait_impls/stdout

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version bump: 1.0.0 -> (breaking) -> 2.0.0
2-
error: breaking changes in `<std::vec::Vec<T, std::alloc::Global> as old::Abc>`
2+
error: breaking changes in `<std::vec::Vec<T> as old::Abc>`
33
--> trait_impls/old.rs:9:1
44
|
55
9 | impl<T> Abc for Vec<T> { }
@@ -19,15 +19,15 @@ error: breaking changes in `<old::Def as std::clone::Clone>`
1919
|
2020
= warning: trait impl specialized or removed (breaking)
2121

22-
warning: technically breaking changes in `<std::boxed::Box<T, std::alloc::Global> as new::Abc>`
22+
warning: technically breaking changes in `<std::boxed::Box<T> as new::Abc>`
2323
--> trait_impls/new.rs:11:1
2424
|
2525
11 | impl<T: Clone> Abc for Box<T> { }
2626
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2727
|
2828
= note: trait impl generalized or newly added (technically breaking)
2929

30-
warning: technically breaking changes in `<std::boxed::Box<new::Def, std::alloc::Global> as new::Abc>`
30+
warning: technically breaking changes in `<std::boxed::Box<new::Def> as new::Abc>`
3131
--> trait_impls/new.rs:13:1
3232
|
3333
13 | impl Abc for Box<Def> { }
@@ -51,5 +51,4 @@ warning: technically breaking changes in `<std::cell::Cell<(bool, T)> as new::Ab
5151
|
5252
= note: trait impl generalized or newly added (technically breaking)
5353

54-
error: aborting due to 2 previous errors; 4 warnings emitted
55-
54+
error: aborting due to 2 previous errors; 4 warnings emitted

0 commit comments

Comments
 (0)