mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #84234 - jyn514:blanket-hash, r=Aaron1011

Browse Source 
Implement DepTrackingHash for `Option` through blanket impls instead of macros

This avoids having to add a new macro call for both the `Option` and the type itself.

Noticed this while working on https://github.com/rust-lang/rust/pull/84233.
r? `@Aaron1011`
This commit is contained in:
bors 2021-06-05 01:08:51 +00:00
commit 9e6f0e878d
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/rustc_session/src/config.rs
View File

@ -2449,30 +2449,32 @@ fn hash(&self, hasher: &mut DefaultHasher, _: ErrorOutputType) {
)+};
}
impl<T: DepTrackingHash> DepTrackingHash for Option<T> {
fn hash(&self, hasher: &mut DefaultHasher, error_format: ErrorOutputType) {
match self {
Some(x) => {
Hash::hash(&1, hasher);
DepTrackingHash::hash(x, hasher, error_format);
}
None => Hash::hash(&0, hasher),
}
}
}
impl_dep_tracking_hash_via_hash!(
bool,
usize,
NonZeroUsize,
u64,
String,
PathBuf,
lint::Level,
Option<bool>,
Option<u32>,
Option<usize>,
Option<NonZeroUsize>,
Option<String>,
Option<(String, u64)>,
Option<Vec<String>>,
Option<MergeFunctions>,
Option<RelocModel>,
Option<CodeModel>,
Option<TlsModel>,
Option<WasiExecModel>,
Option<PanicStrategy>,
Option<RelroLevel>,
Option<InstrumentCoverage>,
Option<lint::Level>,
Option<PathBuf>,
WasiExecModel,
u32,
RelocModel,
CodeModel,
TlsModel,
InstrumentCoverage,
CrateType,
MergeFunctions,
PanicStrategy,
@ -2490,10 +2492,10 @@ fn hash(&self, hasher: &mut DefaultHasher, _: ErrorOutputType) {
TargetTriple,
Edition,
LinkerPluginLto,
Option<SplitDebuginfo>,
SplitDebuginfo,
SwitchWithOptPath,
Option<SymbolManglingVersion>,
Option<SourceFileHashAlgorithm>,
SymbolManglingVersion,
SourceFileHashAlgorithm,
TrimmedDefPaths,
);