diff options
| author | bors <bors@rust-lang.org> | 2024-07-17 03:31:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-17 03:31:18 +0000 |
| commit | a28b35eb35ef874d068b8a66e9ff7460fa23a672 (patch) | |
| tree | 743286dccaf8522f04a2659b7e1029b4eae4d0e4 /compiler/rustc_pattern_analysis/src | |
| parent | 1a6e777c3c9e5dd57e1e62d95e13eeebaaebac04 (diff) | |
| parent | 1a1b44fcae5eddac579b4102d96a0ec24b21c569 (diff) | |
| download | rust-a28b35eb35ef874d068b8a66e9ff7460fa23a672.tar.gz rust-a28b35eb35ef874d068b8a66e9ff7460fa23a672.zip | |
Auto merge of #127840 - tgross35:rollup-jfkg1dq, r=tgross35
Rollup of 9 pull requests Successful merges: - #125206 (Simplify environment variable examples) - #126271 (Skip fast path for dec2flt when optimize_for_size) - #126776 (Clean up more comments near use declarations) - #127444 (`impl Send + Sync` and override `count` for the `CStr::bytes` iterator) - #127512 (Terminate `--print link-args` output with newline) - #127792 (std: Use `read_unaligned` for reads from DWARF) - #127807 (Use futex.rs for Windows thread parking) - #127833 (zkvm: add `#[forbid(unsafe_op_in_unsafe_fn)]` in `stdlib`) - #127836 (std: Forbid unwrapped unsafe ops in xous and uefi modules) Failed merges: - #127813 (Prevent double reference in generic futex) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_pattern_analysis/src')
| -rw-r--r-- | compiler/rustc_pattern_analysis/src/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_pattern_analysis/src/lib.rs b/compiler/rustc_pattern_analysis/src/lib.rs index c9590ad06b0..1b4bcb789d2 100644 --- a/compiler/rustc_pattern_analysis/src/lib.rs +++ b/compiler/rustc_pattern_analysis/src/lib.rs @@ -21,9 +21,7 @@ rustc_fluent_macro::fluent_messages! { "../messages.ftl" } use std::fmt; -// Re-exports to avoid rustc_index version issues. -pub use rustc_index::Idx; -pub use rustc_index::IndexVec; +pub use rustc_index::{Idx, IndexVec}; // re-exported to avoid rustc_index version issues #[cfg(feature = "rustc")] use rustc_middle::ty::Ty; |