From af6d84a7f85c3804bcf60d066f26e33070a17d1c Mon Sep 17 00:00:00 2001 From: Ujp8LfXBJ6wCPR Date: Sun, 9 Jun 2024 10:50:22 +0000 Subject: [PATCH] Fix typos (#429) * Fix typos reported by "typos" crate https://github.com/crate-ci/typos * Ignore typo datas -> data See https://github.com/crate-ci/typos?tab=readme-ov-file#false-positives for more configureability. --------- Co-authored-by: Carl Hjerpe Co-authored-by: Ivan Molodetskikh --- niri-ipc/src/lib.rs | 2 +- resources/niri-session | 2 +- src/cursor.rs | 2 +- src/handlers/compositor.rs | 2 +- src/layout/workspace.rs | 2 +- src/niri.rs | 10 +++++----- typos.toml | 2 ++ wiki/examples/resize_custom_shader.frag | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 typos.toml diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs index 815b2ae7c..e7b1ca191 100644 --- a/niri-ipc/src/lib.rs +++ b/niri-ipc/src/lib.rs @@ -307,7 +307,7 @@ pub enum OutputAction { Mode { /// Mode to set, or "auto" for automatic selection. /// - /// Run `niri msg outputs` to see the avaliable modes. + /// Run `niri msg outputs` to see the available modes. #[cfg_attr(feature = "clap", arg())] mode: ModeToSet, }, diff --git a/resources/niri-session b/resources/niri-session index 85f6991f3..9b0ef7ae8 100755 --- a/resources/niri-session +++ b/resources/niri-session @@ -34,7 +34,7 @@ fi # Start niri and wait for it to terminate. systemctl --user --wait start niri.service -# Force stop of grahical-session.target. +# Force stop of graphical-session.target. systemctl --user start --job-mode=replace-irreversibly niri-shutdown.target # Unset environment that we've set. diff --git a/src/cursor.rs b/src/cursor.rs index e31808a96..041895baa 100644 --- a/src/cursor.rs +++ b/src/cursor.rs @@ -142,7 +142,7 @@ impl CursorManager { .unwrap() } - /// Currenly used cursor_image as a cursor provider. + /// Currently used cursor_image as a cursor provider. pub fn cursor_image(&self) -> &CursorImageStatus { &self.current_cursor } diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs index db14b20e4..0d64faa33 100644 --- a/src/handlers/compositor.rs +++ b/src/handlers/compositor.rs @@ -132,7 +132,7 @@ impl CompositorHandler for State { let output = output.filter(|o| self.niri.layout.monitor_for_output(o).is_some()); - // Chech that the workspace still exists. + // Check that the workspace still exists. let workspace_name = workspace_name .filter(|n| self.niri.layout.find_workspace_by_name(n).is_some()); diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs index 1947475a4..fadbf00c4 100644 --- a/src/layout/workspace.rs +++ b/src/layout/workspace.rs @@ -3355,7 +3355,7 @@ fn compute_new_view_offset( return -(new_col_x - cur_x); } - // Otherwise, prefer the aligment that results in less motion from the current position. + // Otherwise, prefer the alignment that results in less motion from the current position. let dist_to_left = cur_x.abs_diff(new_x); let dist_to_right = (cur_x + view_width).abs_diff(new_right_x); if dist_to_left <= dist_to_right { diff --git a/src/niri.rs b/src/niri.rs index d276a4e86..7da671c29 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -161,7 +161,7 @@ pub struct Niri { pub is_at_startup: bool, // Each workspace corresponds to a Space. Each workspace generally has one Output mapped to it, - // however it may have none (when there are no outputs connected) or mutiple (when mirroring). + // however it may have none (when there are no outputs connected) or multiple (when mirroring). pub layout: Layout, // This space does not actually contain any windows, but all outputs are mapped into it @@ -236,7 +236,7 @@ pub struct Niri { /// When this happens, the pointer also loses any focus. This is so that touch can prevent /// various tooltips from sticking around. pub pointer_hidden: bool, - // FIXME: this should be able to be removed once PointerFocus takes grabs into accound. + // FIXME: this should be able to be removed once PointerFocus takes grabs into account. pub pointer_grab_ongoing: bool, pub tablet_cursor_location: Option>, pub gesture_swipe_3f_cumulative: Option<(f64, f64)>, @@ -377,7 +377,7 @@ struct SurfaceFrameThrottlingState { } pub enum CenterCoords { - Seperately, + Separately, Both, } @@ -535,7 +535,7 @@ impl State { let y_in_bound = cur_loc.y >= rect.loc.y && cur_loc.y <= rect.loc.y + rect.size.h; let p = match mode { - CenterCoords::Seperately => { + CenterCoords::Separately => { if x_in_bound && y_in_bound { return false; } else if y_in_bound { @@ -596,7 +596,7 @@ impl State { return false; } - self.move_cursor_to_focused_tile(CenterCoords::Seperately) + self.move_cursor_to_focused_tile(CenterCoords::Separately) } pub fn maybe_warp_cursor_to_focus_centered(&mut self) -> bool { diff --git a/typos.toml b/typos.toml new file mode 100644 index 000000000..02d3ec106 --- /dev/null +++ b/typos.toml @@ -0,0 +1,2 @@ +[default.extend-words] +datas = "datas" diff --git a/wiki/examples/resize_custom_shader.frag b/wiki/examples/resize_custom_shader.frag index 44f2976d8..01246cdc2 100644 --- a/wiki/examples/resize_custom_shader.frag +++ b/wiki/examples/resize_custom_shader.frag @@ -26,7 +26,7 @@ vec4 resize_color(vec3 coords_curr_geo, vec3 size_curr_geo) { // // The shader runs over an area of unspecified size and location, so you must // expect and handle coordinates outside the [0, 1] range. The area will be -// large enough to accomodate a crossfade effect. +// large enough to accommodate a crossfade effect. // // * size_curr_geo: size of the current window geometry in logical pixels. //