diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cli.rs | 2 | ||||
-rw-r--r-- | src/features/hyperlinks.rs | 2 | ||||
-rw-r--r-- | src/features/side_by_side.rs | 2 | ||||
-rw-r--r-- | src/paint.rs | 2 | ||||
-rw-r--r-- | src/tests/test_example_diffs.rs | 2 | ||||
-rw-r--r-- | src/utils/process.rs | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -963,7 +963,7 @@ pub struct Opt { /// /// Use --tabs=0 to pass tab characters through directly, but note that in that case delta will /// calculate line widths assuming tabs occupy one character's width on the screen: if your - /// terminal renders tabs as more than than one character wide then delta's output will look + /// terminal renders tabs as more than one character wide then delta's output will look /// incorrect. pub tab_width: usize, diff --git a/src/features/hyperlinks.rs b/src/features/hyperlinks.rs index 78be83e9..aac32210 100644 --- a/src/features/hyperlinks.rs +++ b/src/features/hyperlinks.rs @@ -406,7 +406,7 @@ __path__: some matching line } /// Return the relative path as it would appear in grep output, i.e. accounting for facts - /// such as that that the user may have invoked the grep command from a non-root directory + /// such as that the user may have invoked the grep command from a non-root directory /// in the repo. pub fn path_in_grep_output(&self) -> String { use CallingProcess::*; diff --git a/src/features/side_by_side.rs b/src/features/side_by_side.rs index 02f3eebb..82d66593 100644 --- a/src/features/side_by_side.rs +++ b/src/features/side_by_side.rs @@ -358,7 +358,7 @@ fn get_right_fill_style_for_panel( background_color_extends_to_terminal_width: BgShouldFill, config: &Config, ) -> (Option<BgFillMethod>, Style) { - // If in the the left panel then it must be filled with spaces. + // If in the left panel then it must be filled with spaces. let none_or_override = if panel_side == Left { Some(BgFillMethod::Spaces) } else { diff --git a/src/paint.rs b/src/paint.rs index 6ae67d56..67bd58c7 100644 --- a/src/paint.rs +++ b/src/paint.rs @@ -82,7 +82,7 @@ impl<'p> Painter<'p> { )) } else if config.side_by_side { // If line numbers are disabled in side-by-side then the data is still used - // for width calculaction and to pad odd width to even, see `UseFullPanelWidth` + // for width calculation and to pad odd width to even, see `UseFullPanelWidth` // for details. Some(line_numbers::LineNumbersData::empty_for_sbs( panel_width_fix, diff --git a/src/tests/test_example_diffs.rs b/src/tests/test_example_diffs.rs index 6e0983c5..2fca095c 100644 --- a/src/tests/test_example_diffs.rs +++ b/src/tests/test_example_diffs.rs @@ -1604,7 +1604,7 @@ src/align.rs:71: impl<'a> Alignment<'a> { │ fn test_hyperlinks_commit_link_format() { // If commit-style is not set then the commit line is handled in raw // mode, in which case we only format hyperlinks if output is a tty; - // this causes the test to fail on Github Actions, but pass locally + // this causes the test to fail on GitHub Actions, but pass locally // if output is left going to the screen. DeltaTest::with_args(&[ "--commit-style", diff --git a/src/utils/process.rs b/src/utils/process.rs index f3199813..7c3003d8 100644 --- a/src/utils/process.rs +++ b/src/utils/process.rs @@ -1170,7 +1170,7 @@ pub mod tests { #[test] fn test_process_calling_cmdline() { - // Github runs CI tests for arm under qemu where where sysinfo can not find the parent process. + // GitHub runs CI tests for arm under qemu where sysinfo can not find the parent process. if std::env::vars().any(|(key, _)| key == "CROSS_RUNNER" || key == "QEMU_LD_PREFIX") { return; } |