Skip to content

Commit 4d35291

Browse files
committed
Auto merge of #143091 - GuillaumeGomez:rollup-f300qwe, r=GuillaumeGomez
Rollup of 10 pull requests Successful merges: - rust-lang/rust#142270 (Rustdoc js: even more typechecking improvements) - rust-lang/rust#142420 (Report infer ty errors during hir ty lowering) - rust-lang/rust#142671 (add #![rustc_no_implicit_bounds]) - rust-lang/rust#142721 (Add tracing to `InterpCx::layout_of()` ) - rust-lang/rust#142818 (Port `#[used]` to new attribute parsing infrastructure) - rust-lang/rust#143020 (codegen_fn_attrs: make comment more precise) - rust-lang/rust#143051 (Add tracing to `validate_operand`) - rust-lang/rust#143060 (Only args in main diag are saved and restored without removing the newly added ones) - rust-lang/rust#143065 (Improve recovery when users write `where:`) - rust-lang/rust#143084 (const-eval: error when initializing a static writes to that static) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b19d928 + 478527a commit 4d35291

File tree

12 files changed

+1
-12
lines changed

12 files changed

+1
-12
lines changed

src/eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_abi::ExternAbi;
1111
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1212
use rustc_hir::def::Namespace;
1313
use rustc_hir::def_id::DefId;
14-
use rustc_middle::ty::layout::{LayoutCx, LayoutOf};
14+
use rustc_middle::ty::layout::LayoutCx;
1515
use rustc_middle::ty::{self, Ty, TyCtxt};
1616
use rustc_session::config::EntryFnType;
1717

src/intrinsics/simd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use rand::Rng;
33
use rustc_abi::{Endian, HasDataLayout};
44
use rustc_apfloat::{Float, Round};
55
use rustc_middle::ty::FloatTy;
6-
use rustc_middle::ty::layout::LayoutOf;
76
use rustc_middle::{mir, ty};
87
use rustc_span::{Symbol, sym};
98

src/shims/backtrace.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use rustc_abi::{CanonAbi, FieldIdx, Size};
2-
use rustc_middle::ty::layout::LayoutOf as _;
32
use rustc_middle::ty::{self, Instance, Ty};
43
use rustc_span::{BytePos, Loc, Symbol, hygiene};
54
use rustc_target::callconv::FnAbi;

src/shims/os_str.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use std::os::windows::ffi::{OsStrExt, OsStringExt};
77
use std::path::{Path, PathBuf};
88

99
use rustc_middle::ty::Ty;
10-
use rustc_middle::ty::layout::LayoutOf;
1110

1211
use crate::*;
1312

src/shims/unix/env.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use rustc_abi::{FieldIdx, Size};
66
use rustc_data_structures::fx::FxHashMap;
77
use rustc_index::IndexVec;
88
use rustc_middle::ty::Ty;
9-
use rustc_middle::ty::layout::LayoutOf;
109

1110
use crate::*;
1211

src/shims/unix/foreign_items.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::str;
33

44
use rustc_abi::{CanonAbi, ExternAbi, Size};
55
use rustc_middle::ty::Ty;
6-
use rustc_middle::ty::layout::LayoutOf;
76
use rustc_span::Symbol;
87
use rustc_target::callconv::FnAbi;
98

src/shims/windows/thread.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use rustc_abi::ExternAbi;
2-
use rustc_middle::ty::layout::LayoutOf;
32

43
use self::shims::windows::handle::{EvalContextExt as _, Handle, PseudoHandle};
54
use crate::*;

src/shims/x86/aesni.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use rustc_abi::CanonAbi;
22
use rustc_middle::ty::Ty;
3-
use rustc_middle::ty::layout::LayoutOf as _;
43
use rustc_span::Symbol;
54
use rustc_target::callconv::FnAbi;
65

src/shims/x86/avx.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use rustc_abi::CanonAbi;
22
use rustc_apfloat::ieee::{Double, Single};
33
use rustc_middle::mir;
44
use rustc_middle::ty::Ty;
5-
use rustc_middle::ty::layout::LayoutOf as _;
65
use rustc_span::Symbol;
76
use rustc_target::callconv::FnAbi;
87

src/shims/x86/avx2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use rustc_abi::CanonAbi;
22
use rustc_middle::mir;
33
use rustc_middle::ty::Ty;
4-
use rustc_middle::ty::layout::LayoutOf as _;
54
use rustc_span::Symbol;
65
use rustc_target::callconv::FnAbi;
76

src/shims/x86/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use rustc_abi::{CanonAbi, FieldIdx, Size};
22
use rustc_apfloat::Float;
33
use rustc_apfloat::ieee::Single;
44
use rustc_middle::ty::Ty;
5-
use rustc_middle::ty::layout::LayoutOf as _;
65
use rustc_middle::{mir, ty};
76
use rustc_span::Symbol;
87
use rustc_target::callconv::FnAbi;

src/shims/x86/sse42.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use rustc_abi::{CanonAbi, Size};
22
use rustc_middle::mir;
33
use rustc_middle::ty::Ty;
4-
use rustc_middle::ty::layout::LayoutOf as _;
54
use rustc_span::Symbol;
65
use rustc_target::callconv::FnAbi;
76

0 commit comments

Comments
 (0)