Skip to content

Commit 9e86980

Browse files
committed
Auto merge of #143407 - jhpratt:rollup-ekkoubw, r=jhpratt
Rollup of 11 pull requests Successful merges: - rust-lang/rust#142749 (Add methods for converting bool to `Result<(), E>`) - rust-lang/rust#143288 (Fix `x clean` with a fifo) - rust-lang/rust#143307 (Fast path nitpicks) - rust-lang/rust#143346 (update coherence example) - rust-lang/rust#143356 (use unsigned_abs instead of `abs` on signed int to silence clippy) - rust-lang/rust#143370 (remove redundant #[must_use]) - rust-lang/rust#143378 (simplify receivers for some array method calls) - rust-lang/rust#143380 (Replace kw_span by full span for generic const parameters.) - rust-lang/rust#143381 (rustdoc: don't treat methods under const impls or traits as const) - rust-lang/rust#143394 (compiler: Document and reduce `fn provide`s in hir crates) - rust-lang/rust#143395 (Always use the pure Rust fallback instead of `llvm.{maximum,minimum}`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5164bc7 + 650c8e5 commit 9e86980

File tree

1 file changed

+2
-2
lines changed
  • clippy_utils/src/ast_utils

1 file changed

+2
-2
lines changed

clippy_utils/src/ast_utils/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,13 +886,13 @@ pub fn eq_generic_param(l: &GenericParam, r: &GenericParam) -> bool {
886886
(
887887
Const {
888888
ty: lt,
889-
kw_span: _,
890889
default: ld,
890+
span: _,
891891
},
892892
Const {
893893
ty: rt,
894-
kw_span: _,
895894
default: rd,
895+
span: _,
896896
},
897897
) => eq_ty(lt, rt) && both(ld.as_ref(), rd.as_ref(), eq_anon_const),
898898
_ => false,

0 commit comments

Comments
 (0)