Skip to content

Commit 22af75f

Browse files
committed
Auto merge of #138114 - compiler-errors:rollup-7xr4b69, r=compiler-errors
Rollup of 25 pull requests Successful merges: - #135733 (Implement `&pin const self` and `&pin mut self` sugars) - #135895 (Document workings of successors more clearly) - #136922 (Pattern types: Avoid having to handle an Option for range ends in the type system or the HIR) - #137303 (Remove `MaybeForgetReturn` suggestion) - #137327 (Undeprecate env::home_dir) - #137358 (Match Ergonomics 2024: add context and examples to the unstable book) - #137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - #137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - #137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck) - #137643 (Add DWARF test case for non-C-like `repr128` enums) - #137744 (Re-add `Clone`-derive on `Thir`) - #137758 (fix usage of ty decl macro fragments in attributes) - #137764 (Ensure that negative auto impls are always applicable) - #137772 (Fix char count in `Display` for `ByteStr`) - #137798 (ci: use ubuntu 24 on arm large runner) - #137802 (miri native-call support: all previously exposed provenance is accessible to the callee) - #137805 (adjust Layout debug printing to match the internal field name) - #137808 (Do not require that unsafe fields lack drop glue) - #137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - #137825 (Provide more context on resolve error caused from incorrect RTN) - #137834 (rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME) - #137868 (Add minimal platform support documentation for powerpc-unknown-linux-gnuspe) - #137910 (Improve error message for `AsyncFn` trait failure for RPIT) - #137920 (interpret/provenance_map: consistently use range_is_empty) - #138038 (Update `compiler-builtins` to 0.1.151) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b0c728f + 88d15ac commit 22af75f

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

clippy_utils/src/hir_utils.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,14 +1108,9 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
11081108
pub fn hash_ty_pat(&mut self, pat: &TyPat<'_>) {
11091109
std::mem::discriminant(&pat.kind).hash(&mut self.s);
11101110
match pat.kind {
1111-
TyPatKind::Range(s, e, i) => {
1112-
if let Some(s) = s {
1113-
self.hash_const_arg(s);
1114-
}
1115-
if let Some(e) = e {
1116-
self.hash_const_arg(e);
1117-
}
1118-
std::mem::discriminant(&i).hash(&mut self.s);
1111+
TyPatKind::Range(s, e) => {
1112+
self.hash_const_arg(s);
1113+
self.hash_const_arg(e);
11191114
},
11201115
TyPatKind::Err(_) => {},
11211116
}

0 commit comments

Comments
 (0)