diff options
| author | bors <bors@rust-lang.org> | 2023-04-24 19:09:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-24 19:09:19 +0000 |
| commit | 521de433f4b520c77f7e6ec9e68291d09028918c (patch) | |
| tree | 11aa7114da9ad00a7be5936a491ecd663f787244 /compiler/rustc_codegen_llvm/src/debuginfo/metadata | |
| parent | 253b727f46101a18126bfc8a93067aa7a67d9b77 (diff) | |
| parent | 513c0cc5bacf79c285da6576ef883a326470acdc (diff) | |
| download | rust-521de433f4b520c77f7e6ec9e68291d09028918c.tar.gz rust-521de433f4b520c77f7e6ec9e68291d09028918c.zip | |
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
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo/metadata')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs index 38ad42370d3..ecb0912d328 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs @@ -6,7 +6,7 @@ use rustc_codegen_ssa::{ traits::ConstMethods, }; -use rustc_index::vec::IndexVec; +use rustc_index::IndexVec; use rustc_middle::{ bug, ty::{ diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs index 55a217f59f9..9e0e847a155 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs @@ -3,7 +3,7 @@ use rustc_codegen_ssa::debuginfo::{ wants_c_like_enum_debuginfo, }; use rustc_hir::def::CtorKind; -use rustc_index::vec::IndexSlice; +use rustc_index::IndexSlice; use rustc_middle::{ bug, mir::{GeneratorLayout, GeneratorSavedLocal}, |