diff options
| author | bors <bors@rust-lang.org> | 2023-10-09 15:08:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-09 15:08:28 +0000 |
| commit | 317783ad2c128037ab1ab7722fa3fa61a9e481a5 (patch) | |
| tree | 684ce45e11164db8910f1236505f6492468d9592 /compiler/rustc_codegen_cranelift/src/pointer.rs | |
| parent | be581d9f82a1bcc547c685d7e1b411c246b0bb00 (diff) | |
| parent | 27a5146e7cd669cd9979865c04929de10fd7b7b3 (diff) | |
| download | rust-317783ad2c128037ab1ab7722fa3fa61a9e481a5.tar.gz rust-317783ad2c128037ab1ab7722fa3fa61a9e481a5.zip | |
Auto merge of #116569 - matthiaskrgr:rollup-ni0jdd6, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #115882 (improve the suggestion of `generic_bound_failure`) - #116537 (Fix suggestion span involving wrongly placed generic arg on variant) - #116543 (In smir `find_crates` returns `Vec<Crate>` instead of `Option<Crate>`) - #116549 (Simplify some mir passes by using let chains) - #116556 (Sync rustc_codegen_cranelift) - #116561 (Add a test for fixed ICE) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/pointer.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/pointer.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/pointer.rs b/compiler/rustc_codegen_cranelift/src/pointer.rs index b60e56720ed..11ac6b94678 100644 --- a/compiler/rustc_codegen_cranelift/src/pointer.rs +++ b/compiler/rustc_codegen_cranelift/src/pointer.rs @@ -1,11 +1,10 @@ //! Defines [`Pointer`] which is used to improve the quality of the generated clif ir for pointer //! operations. -use crate::prelude::*; - +use cranelift_codegen::ir::immediates::Offset32; use rustc_target::abi::Align; -use cranelift_codegen::ir::immediates::Offset32; +use crate::prelude::*; /// A pointer pointing either to a certain address, a certain stack slot or nothing. #[derive(Copy, Clone, Debug)] |
