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

Commit 8e92282

Browse files
committed
Needed to adjust stdout for trait_impls, due to new allocator generic parameter for `Vec` and `Box`, decided it wasn't worth a separate commit.
1 parent e35c56f commit 8e92282

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rust-toolchain

Lines changed: 1 addition & 1 deletion
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-01-13"
3+
channel = "nightly-2022-01-17"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/translate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
451451
}),
452452
PredicateKind::ConstEvaluatable(uv) => {
453453
if let Some((target_def_id, target_substs)) =
454-
self.translate_orig_substs(index_map, uv.def.did, uv.substs(self.tcx))
454+
self.translate_orig_substs(index_map, uv.def.did, uv.substs)
455455
{
456456
// TODO: We could probably use translated version for
457457
// `WithOptConstParam::const_param_did`

tests/cases/trait_impls/stdout

Lines changed: 3 additions & 3 deletions
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> as old::Abc>`
2+
error: breaking changes in `<std::vec::Vec<T, std::alloc::Global> 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> as new::Abc>`
22+
warning: technically breaking changes in `<std::boxed::Box<T, std::alloc::Global> 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> as new::Abc>`
30+
warning: technically breaking changes in `<std::boxed::Box<new::Def, std::alloc::Global> as new::Abc>`
3131
--> trait_impls/new.rs:13:1
3232
|
3333
13 | impl Abc for Box<Def> { }

0 commit comments

Comments
 (0)