Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change the trait_impls stdout file back, the `Display` impls have gotten
changed back in the meantime it seems.
  • Loading branch information
dario23 committed May 6, 2022
1 parent 310a4ad commit be85c12
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# NOTE: Keep in sync with nightly date on README
[toolchain]
channel = "nightly-2022-02-16"
channel = "nightly-2022-02-26"
components = ["llvm-tools-preview", "rustc-dev"]
8 changes: 6 additions & 2 deletions src/changes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ impl PathChange {

let msg = format!("path changes to `{}`", self.name.0);
let mut builder = if cat == Breaking {
session.struct_span_err(self.def_span, &msg)
session
.struct_span_err(self.def_span, &msg)
.forget_guarantee()
} else {
session.struct_span_warn(self.def_span, &msg)
};
Expand Down Expand Up @@ -903,7 +905,9 @@ impl<'tcx> Change<'tcx> {

let msg = format!("{} changes in {}", self.max, self.name);
let mut builder = if self.max == Breaking {
session.struct_span_err(self.new_span, &msg)
session
.struct_span_err(self.new_span, &msg)
.forget_guarantee()
} else {
session.struct_span_warn(self.new_span, &msg)
};
Expand Down
9 changes: 4 additions & 5 deletions tests/cases/trait_impls/stdout
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version bump: 1.0.0 -> (breaking) -> 2.0.0
error: breaking changes in `<std::vec::Vec<T, std::alloc::Global> as old::Abc>`
error: breaking changes in `<std::vec::Vec<T> as old::Abc>`
--> trait_impls/old.rs:9:1
|
9 | impl<T> Abc for Vec<T> { }
Expand All @@ -19,15 +19,15 @@ error: breaking changes in `<old::Def as std::clone::Clone>`
|
= warning: trait impl specialized or removed (breaking)

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

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

error: aborting due to 2 previous errors; 4 warnings emitted

error: aborting due to 2 previous errors; 4 warnings emitted

0 comments on commit be85c12

Please sign in to comment.