diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index bd92a17f402b4fc15b488ec6abbec2ba9ca66ac9..ad228103e33bd17dbe180d1c267c5141f5433080 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -84,7 +84,7 @@ jobs: run: ./script/check-keymaps shell: bash -euxo pipefail {0} - name: run_tests::check_style::check_for_typos - uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 + uses: crate-ci/typos@2d0ce569feab1f8752f1dde43cc2f2aa53236e06 with: config: ./typos.toml - name: steps::cargo_fmt diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs index 1b317e1ee30daa8e9dfa71a0efe0eba526f9cbbf..dabf7cf2b42cf57becb996e1f9360aaba0b6eead 100644 --- a/crates/gpui/src/window.rs +++ b/crates/gpui/src/window.rs @@ -596,7 +596,7 @@ pub enum HitboxBehavior { /// ``` /// /// This has effects beyond event handling - any use of hitbox checking, such as hover - /// styles and tooltops. These other behaviors are the main point of this mechanism. An + /// styles and tooltips. These other behaviors are the main point of this mechanism. An /// alternative might be to not affect mouse event handling - but this would allow /// inconsistent UI where clicks and moves interact with elements that are not considered to /// be hovered. @@ -624,7 +624,7 @@ pub enum HitboxBehavior { /// desired, then a `cx.stop_propagation()` handler like the one above can be used. /// /// This has effects beyond event handling - this affects any use of `is_hovered`, such as - /// hover styles and tooltops. These other behaviors are the main point of this mechanism. + /// hover styles and tooltips. These other behaviors are the main point of this mechanism. /// An alternative might be to not affect mouse event handling - but this would allow /// inconsistent UI where clicks and moves interact with elements that are not considered to /// be hovered. diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs index 209c08bbb9350cdfa0b8f22c47ab475fb60a82b8..3117c0f5944d05a08524608a82587226a735550e 100644 --- a/crates/project/src/project_tests.rs +++ b/crates/project/src/project_tests.rs @@ -9733,7 +9733,7 @@ async fn test_ignored_dirs_events(cx: &mut gpui::TestAppContext) { ("project/target/debug/deps".to_string(), PathChange::Added), ("project/target/debug/deps".to_string(), PathChange::Removed), ], - "Due to `debug` directory being tracket, it should get updates for entries inside it. + "Due to `debug` directory being tracked, it should get updates for entries inside it. No updates for more nested directories should happen as those are ignored", ); } diff --git a/crates/settings/src/merge_from.rs b/crates/settings/src/merge_from.rs index 6347f231f8d00f0dbe10b98d1172c4b14b105e98..30ad0d3671a76cc614773030a00efda231657b4e 100644 --- a/crates/settings/src/merge_from.rs +++ b/crates/settings/src/merge_from.rs @@ -1,6 +1,6 @@ /// Trait for recursively merging settings structures. /// -/// When Zed starts it loads settinsg from `default.json` to initialize +/// When Zed starts it loads settings from `default.json` to initialize /// everything. These may be further refined by loading the user's settings, /// and any settings profiles; and then further refined by loading any /// local project settings. diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs index 06a2ba734a381f4d077a522bb76713b26b47e72e..e4443ad91313fd4511765fb7be6a8bb092757e9d 100644 --- a/tooling/xtask/src/tasks/workflows/run_tests.rs +++ b/tooling/xtask/src/tasks/workflows/run_tests.rs @@ -226,8 +226,8 @@ fn check_style() -> NamedJob { named::uses( "crate-ci", "typos", - "80c8a4945eec0f6d464eaf9e65ed98ef085283d1", - ) // v1.38.1 + "2d0ce569feab1f8752f1dde43cc2f2aa53236e06", + ) // v1.40.0 .with(("config", "./typos.toml")) } named::job(