diff options
| author | bors <bors@rust-lang.org> | 2024-04-30 13:13:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-30 13:13:54 +0000 |
| commit | 20aa2d81e36036073a9acf418c7d413cb4b22fa6 (patch) | |
| tree | 940e8f0c9df0d84df08c5955c2f84ca1783c1c3f /compiler/rustc_data_structures/src | |
| parent | a7431167e0b8d6ae9fd60650694fbefc3d0fac2f (diff) | |
| parent | 5a4e83c2e031560849ad1e6ba8f6b78b6e572a8c (diff) | |
| download | rust-20aa2d81e36036073a9acf418c7d413cb4b22fa6.tar.gz rust-20aa2d81e36036073a9acf418c7d413cb4b22fa6.zip | |
Auto merge of #124558 - matthiaskrgr:rollup-axi1bxu, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #123247 (Mention Both HRTB and Generic Lifetime Param in `E0637` documentation) - #124511 (Remove many `#[macro_use] extern crate foo` items) - #124550 (Remove redundant union check in `KnownPanicsLint` const prop) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/lib.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/sorted_map.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/svh.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/unord.rs | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs index 2b799d6f5d3..495c1977df9 100644 --- a/compiler/rustc_data_structures/src/lib.rs +++ b/compiler/rustc_data_structures/src/lib.rs @@ -41,8 +41,6 @@ #[macro_use] extern crate tracing; -#[macro_use] -extern crate rustc_macros; use std::fmt; diff --git a/compiler/rustc_data_structures/src/sorted_map.rs b/compiler/rustc_data_structures/src/sorted_map.rs index 1436628139f..21d7c91ec48 100644 --- a/compiler/rustc_data_structures/src/sorted_map.rs +++ b/compiler/rustc_data_structures/src/sorted_map.rs @@ -1,4 +1,5 @@ use crate::stable_hasher::{HashStable, StableHasher, StableOrd}; +use rustc_macros::{Decodable_Generic, Encodable_Generic}; use std::borrow::Borrow; use std::fmt::Debug; use std::mem; diff --git a/compiler/rustc_data_structures/src/svh.rs b/compiler/rustc_data_structures/src/svh.rs index 1cfc9fecd47..38629ea9801 100644 --- a/compiler/rustc_data_structures/src/svh.rs +++ b/compiler/rustc_data_structures/src/svh.rs @@ -6,9 +6,9 @@ //! compiled from distinct sources. use crate::fingerprint::Fingerprint; -use std::fmt; - use crate::stable_hasher; +use rustc_macros::{Decodable_Generic, Encodable_Generic}; +use std::fmt; #[derive(Copy, Clone, PartialEq, Eq, Debug, Encodable_Generic, Decodable_Generic, Hash)] pub struct Svh { diff --git a/compiler/rustc_data_structures/src/unord.rs b/compiler/rustc_data_structures/src/unord.rs index a99e2062039..ca66d58c139 100644 --- a/compiler/rustc_data_structures/src/unord.rs +++ b/compiler/rustc_data_structures/src/unord.rs @@ -3,6 +3,7 @@ //! as required by the query system. use rustc_hash::{FxHashMap, FxHashSet}; +use rustc_macros::{Decodable_Generic, Encodable_Generic}; use std::{ borrow::{Borrow, BorrowMut}, collections::hash_map::Entry, |
