summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYudai Takada <13041216+ydah@users.noreply.github.com>2022-05-23 18:56:28 +0900
committerGitHub <noreply@github.com>2022-05-23 10:56:28 +0100
commite7dbdd48469699f6ce4054cf610e686563314efe (patch)
tree4e8b54237a7b8ac259cc5e9d69a4dec592e83ef8 /src
parent427c9aa971f3d22c8d25aa02449d410b4687d412 (diff)
Tweak some words improved representation (#1078)
* Use "overridden" instead of "overriden" * Use "line_numbers" instead of "linennumbers" * Use "context" instead of "contexct" * Use "summary" instead of "sumary"
Diffstat (limited to 'src')
-rw-r--r--src/features/navigate.rs8
-rw-r--r--src/features/side_by_side.rs4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/features/navigate.rs b/src/features/navigate.rs
index db582dd3..dc31e4a0 100644
--- a/src/features/navigate.rs
+++ b/src/features/navigate.rs
@@ -146,13 +146,13 @@ mod tests {
use crate::tests::integration_test_utils;
#[test]
- fn test_navigate_with_overriden_key_in_main_section() {
+ fn test_navigate_with_overridden_key_in_main_section() {
let git_config_contents = b"
[delta]
features = navigate
file-modified-label = \"modified: \"
";
- let git_config_path = "delta__test_navigate_with_overriden_key_in_main_section.gitconfig";
+ let git_config_path = "delta__test_navigate_with_overridden_key_in_main_section.gitconfig";
assert_eq!(
integration_test_utils::make_options_from_args_and_git_config(&[], None, None)
@@ -191,7 +191,7 @@ mod tests {
}
#[test]
- fn test_navigate_with_overriden_key_in_custom_navigate_section() {
+ fn test_navigate_with_overridden_key_in_custom_navigate_section() {
let git_config_contents = b"
[delta]
features = navigate
@@ -200,7 +200,7 @@ mod tests {
file-modified-label = \"modified: \"
";
let git_config_path =
- "delta__test_navigate_with_overriden_key_in_custom_navigate_section.gitconfig";
+ "delta__test_navigate_with_overridden_key_in_custom_navigate_section.gitconfig";
assert_eq!(
integration_test_utils::make_options_from_args_and_git_config(&[], None, None)
diff --git a/src/features/side_by_side.rs b/src/features/side_by_side.rs
index 1a7d4553..e23ae21f 100644
--- a/src/features/side_by_side.rs
+++ b/src/features/side_by_side.rs
@@ -60,14 +60,14 @@ pub fn available_line_width(
config: &Config,
data: &line_numbers::LineNumbersData,
) -> line_numbers::SideBySideLineWidth {
- let linennumbers_width = data.formatted_width();
+ let line_numbers_width = data.formatted_width();
// The width can be reduced by the line numbers and/or
// a possibly added/restored 1-wide "+/-/ " prefix.
let line_width = |side: PanelSide| {
config.side_by_side_data[side]
.width
- .saturating_sub(linennumbers_width[side])
+ .saturating_sub(line_numbers_width[side])
.saturating_sub(config.keep_plus_minus_markers as usize)
};