diff options
| author | bors <bors@rust-lang.org> | 2024-10-29 07:32:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-29 07:32:45 +0000 |
| commit | 2df8dbb1b37168c59eca2884502a1b79892858a9 (patch) | |
| tree | 95a6bb0a0c66317d71b1ec8465f57783b8effa5e /compiler/rustc_pattern_analysis/src/rustc | |
| parent | a9d17627d241645a54c1134a20f1596127fedb60 (diff) | |
| parent | 89ac69f13af11460240b28fa09e28c16081460ea (diff) | |
| download | rust-2df8dbb1b37168c59eca2884502a1b79892858a9.tar.gz rust-2df8dbb1b37168c59eca2884502a1b79892858a9.zip | |
Auto merge of #132277 - workingjubilee:rollup-5e6q6e4, r=workingjubilee
Rollup of 9 pull requests Successful merges: - #130259 (Lower AST node id only once) - #131441 (Add a new trait `proc_macro::ToTokens`) - #132247 (stable_mir: Directly use types from rustc_abi) - #132249 (compiler: Add rustc_abi dependence to the compiler) - #132255 (Add `LayoutData::is_uninhabited` and use it) - #132258 ([rustdoc] Unify variant struct fields margins with struct fields) - #132260 (cg_llvm: Use a type-safe helper to cast `&str` and `&[u8]` to `*const c_char`) - #132261 (refactor: cleaner check to return None) - #132271 (Updating Fuchsia platform-support documentation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_pattern_analysis/src/rustc')
| -rw-r--r-- | compiler/rustc_pattern_analysis/src/rustc/print.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_pattern_analysis/src/rustc/print.rs b/compiler/rustc_pattern_analysis/src/rustc/print.rs index 17e389df17e..7649f72f868 100644 --- a/compiler/rustc_pattern_analysis/src/rustc/print.rs +++ b/compiler/rustc_pattern_analysis/src/rustc/print.rs @@ -11,10 +11,10 @@ use std::fmt; +use rustc_abi::{FieldIdx, VariantIdx}; use rustc_middle::bug; use rustc_middle::ty::{self, AdtDef, Ty, TyCtxt}; use rustc_span::sym; -use rustc_target::abi::{FieldIdx, VariantIdx}; #[derive(Clone, Debug)] pub(crate) struct FieldPat { |