Skip to content

Commit 831c322

Browse files
Make clippy and rustdoc happy
1 parent 44bf12c commit 831c322

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Diff for: src/tools/clippy/clippy_lints/src/inherent_impl.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,18 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
5656
let Ok(impls) = cx.tcx.crate_inherent_impls(()) else {
5757
return;
5858
};
59-
let inherent_impls = cx
60-
.tcx
61-
.with_stable_hashing_context(|hcx| impls.inherent_impls.to_sorted(&hcx, true));
6259

63-
for (_, impl_ids) in inherent_impls.into_iter().filter(|(&id, impls)| {
64-
impls.len() > 1
60+
for (&id, impl_ids) in &impls.inherent_impls {
61+
if impl_ids.len() < 2
6562
// Check for `#[allow]` on the type definition
66-
&& !is_lint_allowed(
63+
|| is_lint_allowed(
6764
cx,
6865
MULTIPLE_INHERENT_IMPL,
6966
cx.tcx.local_def_id_to_hir_id(id),
70-
)
71-
}) {
67+
) {
68+
continue;
69+
}
70+
7271
for impl_id in impl_ids.iter().map(|id| id.expect_local()) {
7372
let impl_ty = cx.tcx.type_of(impl_id).instantiate_identity();
7473
match type_map.entry(impl_ty) {

Diff for: tests/rustdoc/anchor-id-duplicate-method-name-25001.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ impl Foo<u32> {
2424
}
2525

2626
impl<T> Bar for Foo<T> {
27-
// @has - '//*[@id="associatedtype.Item-1"]//h4[@class="code-header"]' 'type Item = T'
27+
// @has - '//*[@id="associatedtype.Item"]//h4[@class="code-header"]' 'type Item = T'
2828
type Item=T;
2929

3030
// @has - '//*[@id="method.quux"]//h4[@class="code-header"]' 'fn quux(self)'
3131
fn quux(self) {}
3232
}
3333
impl<'a, T> Bar for &'a Foo<T> {
34-
// @has - '//*[@id="associatedtype.Item"]//h4[@class="code-header"]' "type Item = &'a T"
34+
// @has - '//*[@id="associatedtype.Item-1"]//h4[@class="code-header"]' "type Item = &'a T"
3535
type Item=&'a T;
3636

3737
// @has - '//*[@id="method.quux-1"]//h4[@class="code-header"]' 'fn quux(self)'

0 commit comments

Comments
 (0)