Rollup merge of #74986 - matthiaskrgr:cmp_true, r=oli-obk

JohnTitor · web-flow · commit ff5ccc82eb58 · 2020-08-01T08:02:11.000+09:00
fix part of comparison that would always evaluate to "true", probably an oversight cc @jumbatm
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
@@ -2209,7 +2209,7 @@ impl ClashingExternDeclarations {
                 }
                 (Slice(a_ty), Slice(b_ty)) => Self::structurally_same_type(cx, a_ty, b_ty, ckind),
                 (RawPtr(a_tymut), RawPtr(b_tymut)) => {
-                    a_tymut.mutbl == a_tymut.mutbl
+                    a_tymut.mutbl == b_tymut.mutbl
                         && Self::structurally_same_type(cx, &a_tymut.ty, &b_tymut.ty, ckind)
                 }
                 (Ref(_a_region, a_ty, a_mut), Ref(_b_region, b_ty, b_mut)) => {

Original file line number	Diff line number	Diff line change
`@@ -2209,7 +2209,7 @@ impl ClashingExternDeclarations {`
`2209`	`2209`	`}`
`2210`	`2210`	`(Slice(a_ty), Slice(b_ty)) => Self::structurally_same_type(cx, a_ty, b_ty, ckind),`
`2211`	`2211`	`(RawPtr(a_tymut), RawPtr(b_tymut)) => {`
`2212`		`- a_tymut.mutbl == a_tymut.mutbl`
	`2212`	`+ a_tymut.mutbl == b_tymut.mutbl`
`2213`	`2213`	`&& Self::structurally_same_type(cx, &a_tymut.ty, &b_tymut.ty, ckind)`
`2214`	`2214`	`}`
`2215`	`2215`	`(Ref(_a_region, a_ty, a_mut), Ref(_b_region, b_ty, b_mut)) => {`