rebase

2022-06-07 19:29:13 +02:00
parent 8093db6e2b
commit 060acc97db
10 changed files with 118 additions and 44 deletions
--- a/compiler/rustc_middle/src/ty/mod.rs
+++ b/compiler/rustc_middle/src/ty/mod.rs
@@ -42,8 +42,8 @@ use rustc_query_system::ich::StableHashingContext;
 use rustc_session::cstore::CrateStoreDyn;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::Span;
-pub use subst::*;
 use rustc_target::abi::{Align, VariantIdx};
+pub use subst::*;
 pub use vtable::*;

 use std::fmt::Debug;