Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #16601 - Young-Flash:fix_typo_ci, r=Veykril
fix: checkout repo before run typos I see some typos at lastest master :(
bors 2024-02-19
parent 68c506f · parent f3d84e8 · commit e7c9a76
-rw-r--r--.github/workflows/ci.yaml5
-rw-r--r--crates/hir/src/term_search/tactics.rs6
-rw-r--r--crates/ide-completion/src/item.rs2
-rw-r--r--crates/rust-analyzer/tests/slow-tests/support.rs2
-rw-r--r--crates/salsa/src/lib.rs4
-rw-r--r--crates/salsa/src/lru.rs2
6 files changed, 13 insertions, 8 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 62fbd57abc..5a8b18e3fe 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -226,6 +226,11 @@ jobs:
- name: download typos
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
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+
- name: check for typos
run: typos
diff --git a/crates/hir/src/term_search/tactics.rs b/crates/hir/src/term_search/tactics.rs
index 666d63ac15..edbf75affe 100644
--- a/crates/hir/src/term_search/tactics.rs
+++ b/crates/hir/src/term_search/tactics.rs
@@ -281,14 +281,14 @@ pub(super) fn type_constructor<'a, DB: HirDatabase>(
if ctx.config.enable_borrowcheck && struct_ty.contains_reference(db) {
return None;
}
- let fileds = it.fields(db);
+ let fields = it.fields(db);
// Check if all fields are visible, otherwise we cannot fill them
- if fileds.iter().any(|it| !it.is_visible_from(db, module)) {
+ if fields.iter().any(|it| !it.is_visible_from(db, module)) {
return None;
}
// Early exit if some param cannot be filled from lookup
- let param_exprs: Vec<Vec<Expr>> = fileds
+ let param_exprs: Vec<Vec<Expr>> = fields
.into_iter()
.map(|field| lookup.find(db, &field.ty(db)))
.collect::<Option<_>>()?;
diff --git a/crates/ide-completion/src/item.rs b/crates/ide-completion/src/item.rs
index c2c0641961..4bab288685 100644
--- a/crates/ide-completion/src/item.rs
+++ b/crates/ide-completion/src/item.rs
@@ -308,7 +308,7 @@ impl CompletionRelevance {
// When a fn is bumped due to return type:
// Bump Constructor or Builder methods with no arguments,
- // over them tha with self arguments
+ // over them than with self arguments
if fn_score > 0 {
if !asf.has_params {
// bump associated functions
diff --git a/crates/rust-analyzer/tests/slow-tests/support.rs b/crates/rust-analyzer/tests/slow-tests/support.rs
index 392a717020..dfd25abc70 100644
--- a/crates/rust-analyzer/tests/slow-tests/support.rs
+++ b/crates/rust-analyzer/tests/slow-tests/support.rs
@@ -243,7 +243,7 @@ impl Server {
to_string_pretty(actual_part).unwrap(),
);
} else {
- tracing::debug!("sucessfully matched notification");
+ tracing::debug!("successfully matched notification");
return;
}
} else {
diff --git a/crates/salsa/src/lib.rs b/crates/salsa/src/lib.rs
index 668dcfd925..48b5d633bd 100644
--- a/crates/salsa/src/lib.rs
+++ b/crates/salsa/src/lib.rs
@@ -456,12 +456,12 @@ pub trait Query: Debug + Default + Sized + for<'d> QueryDb<'d> {
/// Name of the query method (e.g., `foo`)
const QUERY_NAME: &'static str;
- /// Extact storage for this query from the storage for its group.
+ /// Extract storage for this query from the storage for its group.
fn query_storage<'a>(
group_storage: &'a <Self as QueryDb<'_>>::GroupStorage,
) -> &'a std::sync::Arc<Self::Storage>;
- /// Extact storage for this query from the storage for its group.
+ /// Extract storage for this query from the storage for its group.
fn query_storage_mut<'a>(
group_storage: &'a <Self as QueryDb<'_>>::GroupStorage,
) -> &'a std::sync::Arc<Self::Storage>;
diff --git a/crates/salsa/src/lru.rs b/crates/salsa/src/lru.rs
index c6b9778f20..1ff85a3ea4 100644
--- a/crates/salsa/src/lru.rs
+++ b/crates/salsa/src/lru.rs
@@ -40,7 +40,7 @@ pub(crate) trait LruNode: Sized + Debug {
#[derive(Debug)]
pub(crate) struct LruIndex {
- /// Index in the approprate LRU list, or std::usize::MAX if not a
+ /// Index in the appropriate LRU list, or std::usize::MAX if not a
/// member.
index: AtomicUsize,
}