Skip to content

Commit 29155a4

Browse files
committed
Auto merge of #156361 - jhpratt:rollup-G3Jg88X, r=jhpratt
Rollup of 5 pull requests Successful merges: - #156354 (Update example code of `std::array::from_fn`) - #156359 (use `cfg_select!` in integer `{to, from}_{le, be}`) - #156124 (Make stable hashing names consistent (part 2)) - #156235 (fix: Guard SizeSkeleton::compute against stack overflow) - #156353 (resolve: Set correct parent and expansion for `self` declarations)
2 parents 0490dd9 + c32a2cd commit 29155a4

88 files changed

Lines changed: 372 additions & 323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

compiler/rustc_abi/src/extern_abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::fmt;
33
use std::hash::{Hash, Hasher};
44

55
#[cfg(feature = "nightly")]
6-
use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher, StableOrd};
6+
use rustc_data_structures::stable_hash::{StableHash, StableHashCtxt, StableHasher, StableOrd};
77
#[cfg(feature = "nightly")]
88
use rustc_macros::{Decodable, Encodable};
99
#[cfg(feature = "nightly")]

compiler/rustc_abi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use std::str::FromStr;
4545

4646
use bitflags::bitflags;
4747
#[cfg(feature = "nightly")]
48-
use rustc_data_structures::stable_hasher::StableOrd;
48+
use rustc_data_structures::stable_hash::StableOrd;
4949
#[cfg(feature = "nightly")]
5050
use rustc_error_messages::{DiagArgValue, IntoDiagArg};
5151
#[cfg(feature = "nightly")]

compiler/rustc_ast/src/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub use GenericArgs::*;
2525
pub use UnsafeSource::*;
2626
pub use rustc_ast_ir::{FloatTy, IntTy, Movability, Mutability, Pinnedness, UintTy};
2727
use rustc_data_structures::packed::Pu128;
28-
use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher};
28+
use rustc_data_structures::stable_hash::{StableHash, StableHashCtxt, StableHasher};
2929
use rustc_data_structures::stack::ensure_sufficient_stack;
3030
use rustc_data_structures::tagged_ptr::Tag;
3131
use rustc_macros::{Decodable, Encodable, StableHash, Walkable};

compiler/rustc_ast/src/node_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::fmt;
22

3-
use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher};
3+
use rustc_data_structures::stable_hash::{StableHash, StableHashCtxt, StableHasher};
44
use rustc_span::LocalExpnId;
55

66
rustc_index::newtype_index! {

compiler/rustc_ast/src/tokenstream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::ops::Range;
1010
use std::sync::Arc;
1111
use std::{cmp, fmt, iter, mem};
1212

13-
use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher};
13+
use rustc_data_structures::stable_hash::{StableHash, StableHashCtxt, StableHasher};
1414
use rustc_data_structures::sync;
1515
use rustc_macros::{Decodable, Encodable, StableHash, Walkable};
1616
use rustc_serialize::{Decodable, Encodable};

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use rustc_attr_parsing::{AttributeParser, OmitDoc, Recovery, ShouldEmit};
4545
use rustc_data_structures::fingerprint::Fingerprint;
4646
use rustc_data_structures::fx::FxIndexSet;
4747
use rustc_data_structures::sorted_map::SortedMap;
48-
use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
48+
use rustc_data_structures::stable_hash::{StableHash, StableHasher};
4949
use rustc_data_structures::steal::Steal;
5050
use rustc_data_structures::tagged_ptr::TaggedRef;
5151
use rustc_errors::{DiagArgFromDisplay, DiagCtxtHandle};

compiler/rustc_codegen_cranelift/src/driver/aot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rustc_codegen_ssa::back::write::produce_final_output_artifacts;
1414
use rustc_codegen_ssa::base::determine_cgu_reuse;
1515
use rustc_codegen_ssa::{CompiledModule, CompiledModules, ModuleKind};
1616
use rustc_data_structures::profiling::SelfProfilerRef;
17-
use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher};
17+
use rustc_data_structures::stable_hash::{StableHash, StableHashCtxt, StableHasher};
1818
use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
1919
use rustc_hir::attrs::Linkage as RLinkage;
2020
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};

compiler/rustc_codegen_llvm/src/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_abi::{self as abi, HasDataLayout as _};
88
use rustc_ast::Mutability;
99
use rustc_codegen_ssa::common::TypeKind;
1010
use rustc_codegen_ssa::traits::*;
11-
use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
11+
use rustc_data_structures::stable_hash::{StableHash, StableHasher};
1212
use rustc_hashes::Hash128;
1313
use rustc_hir::def_id::DefId;
1414
use rustc_middle::bug;

compiler/rustc_codegen_llvm/src/debuginfo/metadata/type_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use libc::c_uint;
44
use rustc_abi::{Align, Size, VariantIdx};
55
use rustc_data_structures::fingerprint::Fingerprint;
66
use rustc_data_structures::fx::FxHashMap;
7-
use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
7+
use rustc_data_structures::stable_hash::{StableHash, StableHasher};
88
use rustc_macros::StableHash;
99
use rustc_middle::bug;
1010
use rustc_middle::ty::{self, ExistentialTraitRef, Ty, TyCtxt, Unnormalized};

compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
55
use rustc_abi::Endian;
66
use rustc_data_structures::base_n::{CASE_INSENSITIVE, ToBaseN};
77
use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
8-
use rustc_data_structures::stable_hasher::StableHasher;
8+
use rustc_data_structures::stable_hash::StableHasher;
99
use rustc_hashes::Hash128;
1010
use rustc_hir::attrs::NativeLibKind;
1111
use rustc_session::Session;

0 commit comments

Comments
 (0)