Skip to content

Commit 9e1dd03

Browse files
committed
Auto merge of #102614 - matthiaskrgr:rollup-fjyu7oo, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #102550 (rustdoc: remove no-op CSS on `.impl, .method` etc) - #102591 (Fix duplicate usage of `a` article.) - #102592 (Remove a couple lifetimes that can be infered) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6758aad + fcdef76 commit 9e1dd03

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

crates/ide-db/src/imports/merge_imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ fn path_cmp_short(a: &ast::Path, b: &ast::Path) -> Ordering {
225225
}
226226

227227
/// Compares two paths, if one ends earlier than the other the has_tl parameters decide which is
228-
/// greater as a a path that has a tree list should be greater, while one that just ends without
228+
/// greater as a path that has a tree list should be greater, while one that just ends without
229229
/// a tree list should be considered less.
230230
pub(super) fn use_tree_path_cmp(
231231
a: &ast::Path,

crates/rust-analyzer/src/bin/logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ where
132132

133133
let ext = span.extensions();
134134

135-
// `FormattedFields` is a a formatted representation of the span's
135+
// `FormattedFields` is a formatted representation of the span's
136136
// fields, which is stored in its extensions by the `fmt` layer's
137137
// `new_span` method. The fields will have been formatted
138138
// by the same field formatter that's provided to the event

0 commit comments

Comments
 (0)