Skip to content

Commit 2a0bc0a

Browse files
committed
Auto merge of #145388 - GuillaumeGomez:rollup-hnlt5ov, r=GuillaumeGomez
Rollup of 13 pull requests Successful merges: - rust-lang/rust#140434 (rustdoc: Allow multiple references to a single footnote) - rust-lang/rust#142372 (Improve `--remap-path-prefix` documentation) - rust-lang/rust#142741 (Fix unsoundness in some tests) - rust-lang/rust#144515 (Implement `ptr_cast_array`) - rust-lang/rust#144727 (Add tracing to resolve-related functions) - rust-lang/rust#144959 (fix(unicode-table-generator): fix duplicated unique indices) - rust-lang/rust#145179 (Avoid abbreviating "numerator" as "numer", to allow catching typo "numer" elsewhere) - rust-lang/rust#145250 (Add regression test for a former ICE involving helper attributes containing interpolated tokens) - rust-lang/rust#145266 (Reduce some queries around associated items) - rust-lang/rust#145299 (doc test: fix mpsc.rs try_send doc test) - rust-lang/rust#145323 (Port the `#[linkage]` attribute to the new attribute system) - rust-lang/rust#145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved) - rust-lang/rust#145372 (resolve: Miscellaneous cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 05e9343 + 66b2463 commit 2a0bc0a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use rustc_codegen_ssa::ModuleCodegen;
88
use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
99
use rustc_codegen_ssa::mono_item::MonoItemExt;
1010
use rustc_codegen_ssa::traits::DebugInfoCodegenMethods;
11+
use rustc_hir::attrs::Linkage;
1112
use rustc_middle::dep_graph;
12-
use rustc_middle::mir::mono::Linkage;
1313
#[cfg(feature = "master")]
1414
use rustc_middle::mir::mono::Visibility;
1515
use rustc_middle::ty::TyCtxt;

src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use rustc_abi::{self as abi, Align, HasDataLayout, Primitive, Size, WrappingRang
55
use rustc_codegen_ssa::traits::{
66
BaseTypeCodegenMethods, ConstCodegenMethods, StaticCodegenMethods,
77
};
8+
use rustc_hir::attrs::Linkage;
89
use rustc_hir::def::DefKind;
910
use rustc_hir::def_id::LOCAL_CRATE;
1011
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
1112
use rustc_middle::mir::interpret::{
1213
self, ConstAllocation, ErrorHandled, Scalar as InterpScalar, read_target_uint,
1314
};
14-
use rustc_middle::mir::mono::Linkage;
1515
use rustc_middle::ty::layout::LayoutOf;
1616
use rustc_middle::ty::{self, Instance};
1717
use rustc_middle::{bug, span_bug};

src/mono_item.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#[cfg(feature = "master")]
22
use gccjit::{FnAttribute, VarAttribute};
33
use rustc_codegen_ssa::traits::PreDefineCodegenMethods;
4+
use rustc_hir::attrs::Linkage;
45
use rustc_hir::def::DefKind;
56
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
67
use rustc_middle::bug;
78
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
8-
use rustc_middle::mir::mono::{Linkage, Visibility};
9+
use rustc_middle::mir::mono::Visibility;
910
use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv, LayoutOf};
1011
use rustc_middle::ty::{self, Instance, TypeVisitableExt};
1112

0 commit comments

Comments
 (0)