diff options
| author | bors <bors@rust-lang.org> | 2023-01-31 19:24:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-31 19:24:29 +0000 |
| commit | dc1d9d50fba2f6a1ccab8748a0050cde38253f60 (patch) | |
| tree | 1497db582bb148e212d04fb4acc229d85aff2617 /compiler/rustc_const_eval/src | |
| parent | f361413cbf44ce2f144df59fc440cd484af4a56e (diff) | |
| parent | 652f79e83543eab07c33840748cf5df37b42ac66 (diff) | |
| download | rust-dc1d9d50fba2f6a1ccab8748a0050cde38253f60.tar.gz rust-dc1d9d50fba2f6a1ccab8748a0050cde38253f60.zip | |
Auto merge of #107297 - Mark-Simulacrum:bump-bootstrap, r=pietroalbini
Bump bootstrap compiler to 1.68 This also changes our stage0.json to include the rustc component for the rustfmt pinned nightly toolchain, which is currently necessary due to rustfmt dynamically linking to that toolchain's librustc_driver and libstd. r? `@pietroalbini`
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/intern.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/intern.rs b/compiler/rustc_const_eval/src/interpret/intern.rs index 54528b1dbf4..301bfcef78a 100644 --- a/compiler/rustc_const_eval/src/interpret/intern.rs +++ b/compiler/rustc_const_eval/src/interpret/intern.rs @@ -30,15 +30,15 @@ use super::{ use crate::const_eval; pub trait CompileTimeMachine<'mir, 'tcx, T> = Machine< - 'mir, - 'tcx, - MemoryKind = T, - Provenance = AllocId, - ExtraFnVal = !, - FrameExtra = (), - AllocExtra = (), - MemoryMap = FxIndexMap<AllocId, (MemoryKind<T>, Allocation)>, ->; + 'mir, + 'tcx, + MemoryKind = T, + Provenance = AllocId, + ExtraFnVal = !, + FrameExtra = (), + AllocExtra = (), + MemoryMap = FxIndexMap<AllocId, (MemoryKind<T>, Allocation)>, + >; struct InternVisitor<'rt, 'mir, 'tcx, M: CompileTimeMachine<'mir, 'tcx, const_eval::MemoryKind>> { /// The ectx from which we intern. |
