Skip to content

Commit 521de43

Browse files
committed
Auto merge of #110778 - JohnTitor:rollup-7f51qwk, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #110480 (Add `known-bug` tests for 11 unsound issues) - #110539 (Move around `{Idx, IndexVec, IndexSlice}` adjacent code) - #110590 (Add some tests around (lack of) object safety of associated types and consts) - #110602 (Ignore src/bootstrap formatting commit in .git-blame-ignore-revs) - #110667 (pointer-auth-link-with-c: Fix cross compilation.) - #110681 (drop few unused crates, gate libc under unix for rustc_codegen_ssa) - #110685 (Some cleanups to DataflowConstProp) - #110744 (bootstrap: update paths cargo-credential crate) - #110750 (Add size asserts for MIR `SourceScopeData` & `VarDebugInfo`) - #110760 (rustdoc: Add regression test for #60522) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 253b727 + 513c0cc commit 521de43

File tree

196 files changed

+1150
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+1150
-639
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ a06baa56b95674fc626b3c3fd680d6a65357fe60
1212
c34fbfaad38cf5829ef5cfe780dc9d58480adeaa
1313
# move tests
1414
cf2dff2b1e3fa55fa5415d524200070d0d7aacfe
15+
# Run rustfmt on bootstrap
16+
b39a1d6f1a30ba29f25d7141038b9a5bf0126e36

Cargo.lock

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3209,7 +3209,6 @@ dependencies = [
32093209
"serde",
32103210
"serde_json",
32113211
"smallvec",
3212-
"tempfile",
32133212
"tracing",
32143213
]
32153214

@@ -3303,7 +3302,6 @@ dependencies = [
33033302
"rustc_macros",
33043303
"rustc_serialize",
33053304
"smallvec",
3306-
"stable_deref_trait",
33073305
"stacker",
33083306
"tempfile",
33093307
"thin-vec",
@@ -3516,7 +3514,6 @@ dependencies = [
35163514
"rustc_trait_selection",
35173515
"rustc_type_ir",
35183516
"smallvec",
3519-
"thin-vec",
35203517
"tracing",
35213518
]
35223519

@@ -3653,7 +3650,6 @@ dependencies = [
36533650
"rustc_trait_selection",
36543651
"rustc_traits",
36553652
"rustc_ty_utils",
3656-
"smallvec",
36573653
"tracing",
36583654
]
36593655

@@ -3761,7 +3757,6 @@ dependencies = [
37613757
"rustc_span",
37623758
"rustc_target",
37633759
"rustc_type_ir",
3764-
"smallvec",
37653760
"snap",
37663761
"tempfile",
37673762
"tracing",
@@ -3891,7 +3886,6 @@ dependencies = [
38913886
"rustc_target",
38923887
"serde",
38933888
"serde_json",
3894-
"smallvec",
38953889
"tracing",
38963890
]
38973891

@@ -4010,7 +4004,6 @@ version = "0.0.0"
40104004
dependencies = [
40114005
"parking_lot 0.11.2",
40124006
"rustc-rayon-core",
4013-
"rustc_arena",
40144007
"rustc_ast",
40154008
"rustc_data_structures",
40164009
"rustc_errors",
@@ -4080,7 +4073,6 @@ dependencies = [
40804073
"rustc_fluent_macro",
40814074
"rustc_fs_util",
40824075
"rustc_hir",
4083-
"rustc_index",
40844076
"rustc_lint_defs",
40854077
"rustc_macros",
40864078
"rustc_serialize",
@@ -4149,7 +4141,6 @@ dependencies = [
41494141
"rustc_data_structures",
41504142
"rustc_feature",
41514143
"rustc_fs_util",
4152-
"rustc_index",
41534144
"rustc_macros",
41544145
"rustc_serialize",
41554146
"rustc_span",
@@ -4167,7 +4158,6 @@ checksum = "8ba09476327c4b70ccefb6180f046ef588c26a24cf5d269a9feba316eb4f029f"
41674158
name = "rustc_trait_selection"
41684159
version = "0.0.0"
41694160
dependencies = [
4170-
"itertools",
41714161
"rustc_ast",
41724162
"rustc_attr",
41734163
"rustc_data_structures",
@@ -4199,7 +4189,6 @@ dependencies = [
41994189
"rustc_ast",
42004190
"rustc_data_structures",
42014191
"rustc_hir",
4202-
"rustc_index",
42034192
"rustc_infer",
42044193
"rustc_middle",
42054194
"rustc_span",

compiler/rustc_abi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_data_structures::intern::Interned;
1212
use rustc_data_structures::stable_hasher::Hash64;
1313
#[cfg(feature = "nightly")]
1414
use rustc_data_structures::stable_hasher::StableOrd;
15-
use rustc_index::vec::{IndexSlice, IndexVec};
15+
use rustc_index::{IndexSlice, IndexVec};
1616
#[cfg(feature = "nightly")]
1717
use rustc_macros::HashStable_Generic;
1818
#[cfg(feature = "nightly")]

compiler/rustc_ast_lowering/src/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_hir::def_id::LocalDefId;
55
use rustc_hir::definitions;
66
use rustc_hir::intravisit::{self, Visitor};
77
use rustc_hir::*;
8-
use rustc_index::vec::{Idx, IndexVec};
8+
use rustc_index::{Idx, IndexVec};
99
use rustc_middle::span_bug;
1010
use rustc_session::Session;
1111
use rustc_span::source_map::SourceMap;

compiler/rustc_ast_lowering/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_hir as hir;
1212
use rustc_hir::def::{DefKind, Res};
1313
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
1414
use rustc_hir::PredicateOrigin;
15-
use rustc_index::vec::{Idx, IndexSlice, IndexVec};
15+
use rustc_index::{Idx, IndexSlice, IndexVec};
1616
use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
1717
use rustc_span::edit_distance::find_best_match_for_name;
1818
use rustc_span::source_map::DesugaringKind;

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
6161
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
6262
use rustc_hir::definitions::DefPathData;
6363
use rustc_hir::{ConstArg, GenericArg, ItemLocalId, ParamName, TraitCandidate};
64-
use rustc_index::vec::{Idx, IndexSlice, IndexVec};
64+
use rustc_index::{Idx, IndexSlice, IndexVec};
6565
use rustc_middle::{
6666
span_bug,
6767
ty::{ResolverAstLowering, TyCtxt},

compiler/rustc_borrowck/src/constraints/graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_data_structures::graph;
2-
use rustc_index::vec::IndexVec;
2+
use rustc_index::IndexVec;
33
use rustc_middle::mir::ConstraintCategory;
44
use rustc_middle::ty::{RegionVid, VarianceDiagInfo};
55
use rustc_span::DUMMY_SP;

compiler/rustc_borrowck/src/constraints/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![deny(rustc::diagnostic_outside_of_impl)]
33

44
use rustc_data_structures::graph::scc::Sccs;
5-
use rustc_index::vec::{IndexSlice, IndexVec};
5+
use rustc_index::{IndexSlice, IndexVec};
66
use rustc_middle::mir::ConstraintCategory;
77
use rustc_middle::ty::{RegionVid, VarianceDiagInfo};
88
use rustc_span::Span;

compiler/rustc_borrowck/src/consumers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! This file provides API for compiler consumers.
44
55
use rustc_hir::def_id::LocalDefId;
6-
use rustc_index::vec::IndexSlice;
6+
use rustc_index::IndexSlice;
77
use rustc_infer::infer::{DefiningAnchor, TyCtxtInferExt};
88
use rustc_middle::mir::Body;
99
use rustc_middle::ty::TyCtxt;

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use rustc_errors::{Applicability, Diagnostic};
44
use rustc_hir as hir;
55
use rustc_hir::intravisit::Visitor;
6-
use rustc_index::vec::IndexSlice;
6+
use rustc_index::IndexSlice;
77
use rustc_infer::infer::NllRegionVariableOrigin;
88
use rustc_middle::mir::{
99
Body, CastKind, ConstraintCategory, FakeReadCause, Local, LocalInfo, Location, Operand, Place,

0 commit comments

Comments
 (0)