Skip to content

Commit e7c9a76

Browse files
committed
Auto merge of #16601 - Young-Flash:fix_typo_ci, r=Veykril
fix: checkout repo before run typos I see some typos at lastest master :(
2 parents 68c506f + f3d84e8 commit e7c9a76

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.github/workflows/ci.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ jobs:
226226
- name: download typos
227227
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
228228

229+
- name: Checkout repository
230+
uses: actions/checkout@v4
231+
with:
232+
ref: ${{ github.event.pull_request.head.sha }}
233+
229234
- name: check for typos
230235
run: typos
231236

crates/hir/src/term_search/tactics.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ pub(super) fn type_constructor<'a, DB: HirDatabase>(
281281
if ctx.config.enable_borrowcheck && struct_ty.contains_reference(db) {
282282
return None;
283283
}
284-
let fileds = it.fields(db);
284+
let fields = it.fields(db);
285285
// Check if all fields are visible, otherwise we cannot fill them
286-
if fileds.iter().any(|it| !it.is_visible_from(db, module)) {
286+
if fields.iter().any(|it| !it.is_visible_from(db, module)) {
287287
return None;
288288
}
289289

290290
// Early exit if some param cannot be filled from lookup
291-
let param_exprs: Vec<Vec<Expr>> = fileds
291+
let param_exprs: Vec<Vec<Expr>> = fields
292292
.into_iter()
293293
.map(|field| lookup.find(db, &field.ty(db)))
294294
.collect::<Option<_>>()?;

crates/ide-completion/src/item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ impl CompletionRelevance {
308308

309309
// When a fn is bumped due to return type:
310310
// Bump Constructor or Builder methods with no arguments,
311-
// over them tha with self arguments
311+
// over them than with self arguments
312312
if fn_score > 0 {
313313
if !asf.has_params {
314314
// bump associated functions

crates/rust-analyzer/tests/slow-tests/support.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ impl Server {
243243
to_string_pretty(actual_part).unwrap(),
244244
);
245245
} else {
246-
tracing::debug!("sucessfully matched notification");
246+
tracing::debug!("successfully matched notification");
247247
return;
248248
}
249249
} else {

crates/salsa/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,12 @@ pub trait Query: Debug + Default + Sized + for<'d> QueryDb<'d> {
456456
/// Name of the query method (e.g., `foo`)
457457
const QUERY_NAME: &'static str;
458458

459-
/// Extact storage for this query from the storage for its group.
459+
/// Extract storage for this query from the storage for its group.
460460
fn query_storage<'a>(
461461
group_storage: &'a <Self as QueryDb<'_>>::GroupStorage,
462462
) -> &'a std::sync::Arc<Self::Storage>;
463463

464-
/// Extact storage for this query from the storage for its group.
464+
/// Extract storage for this query from the storage for its group.
465465
fn query_storage_mut<'a>(
466466
group_storage: &'a <Self as QueryDb<'_>>::GroupStorage,
467467
) -> &'a std::sync::Arc<Self::Storage>;

crates/salsa/src/lru.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub(crate) trait LruNode: Sized + Debug {
4040

4141
#[derive(Debug)]
4242
pub(crate) struct LruIndex {
43-
/// Index in the approprate LRU list, or std::usize::MAX if not a
43+
/// Index in the appropriate LRU list, or std::usize::MAX if not a
4444
/// member.
4545
index: AtomicUsize,
4646
}

0 commit comments

Comments
 (0)