Merge pull request #1341 from szepeviktor/typos

Fix typos

Author: Byron

.gov/info.yml

@@ -8,6 +8,6 @@ maintainers:
     - push directly to 'main' branch
     - reviews or suggestions by other maintainers if PRs are used
     - co-ownership of contributed crates
-    - reveive sponsorship via GitHub from project page
+    - receive sponsorship via GitHub from project page
 
 

Cargo.toml

@@ -64,7 +64,7 @@ small = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend"
 ## This build is more of a demonstration showing how async can work with `gitoxide`, which generally is blocking. This also means that the selection of async transports
 ## is very limited to only HTTP (without typical `git` configuration) and git over TCP like provided by the `git daemon`.
 ##
-## As fast as possible, progress line rendering, less feature-ful HTTP (pure Rust) and only `git-damon` support, all `ein` tools, CLI colors and local-time support, JSON output.
+## As fast as possible, progress line rendering, less featureful HTTP (pure Rust) and only `git-daemon` support, all `ein` tools, CLI colors and local-time support, JSON output.
 ##
 ## Due to async client-networking not being implemented for most transports, this one supports only the 'git+tcp' and HTTP transport.
 ## It uses, however, a fully asynchronous networking implementation which can serve a real-world example on how to implement custom async transports.

_typos.toml

@@ -1,19 +1,32 @@
-[default]
-extend-ignore-identifiers-re = [
-    "[a-f0-9]{7,}", 
-    "[Ff][Oo][Oo]",
-    "[a-zA-Z0-9]{20,}",
-]
-
 [files]
 extend-exclude = [
     "**/CHANGELOG.md",
-    "**/tests/fixtures/**",
+    "*.response",
+    "etc/corpus/repo_metadata.sample.jsonl",
     "gix-config/benches/large_config_file.rs",
-    "gix-glob/tests/wildmatch/mod.rs"
+    "gix-config/tests/fixtures/clusterfuzz-testcase-minimized-gix-config-parse-6431708583690240",
+    "gix-glob/tests/wildmatch/mod.rs",
+    "gix-path/tests/fixtures/fuzzed/54k-path-components.path",
 ]
+ignore-hidden = false
 
+[default]
+extend-ignore-re = [
+    # PGP signature
+    "[0-9A-Za-z+=]{44,}",
+    '"egal"',
+    '"bar", "bart", "ba"',
+    '"foo/ba"',
+    '"FO", "FO", &\[\], "FO"',
+    '"(BarFoO|BarFoOo|FoO|FoOo)"',
+    "\\|pn: &BStr\\| pn !=",
+]
+extend-ignore-identifiers-re = [
+    # Git commit hash
+    "[0-9a-f]{7,}",
+    "rela_[a-z_]+",
+]
 
-[default.extend-words]
-rela = "rela"
-unter = "unter"
+[default.extend-identifiers]
+_pn = "_pn"
+ein = "ein"

gitoxide-core/src/repository/clean.rs

@@ -60,7 +60,7 @@ pub(crate) mod function {
         let index = repo.index_or_empty()?;
         let pathspec_for_dirwalk = !pathspec_matches_result;
         let has_patterns = !patterns.is_empty();
-        let mut collect = InterruptableCollect::default();
+        let mut collect = InterruptibleCollect::default();
         let collapse_directories = CollapseDirectory;
         let options = repo
             .dirwalk_options()?
@@ -365,11 +365,11 @@ pub(crate) mod function {
     }
 
     #[derive(Default)]
-    struct InterruptableCollect {
+    struct InterruptibleCollect {
         inner: gix::dir::walk::delegate::Collect,
     }
 
-    impl gix::dir::walk::Delegate for InterruptableCollect {
+    impl gix::dir::walk::Delegate for InterruptibleCollect {
         fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option<Status>) -> walk::Action {
             let res = self.inner.emit(entry, collapsed_directory_status);
             if gix::interrupt::is_triggered() {

gix-config/src/parse/nom/mod.rs

@@ -190,10 +190,10 @@ fn subsection_unescaped<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i
 }
 
 fn subsection_escaped_char<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i [u8]>> {
-    preceded('\\', one_of(is_subsection_escapeable_char).recognize()).parse_next(i)
+    preceded('\\', one_of(is_subsection_escapable_char).recognize()).parse_next(i)
 }
 
-fn is_subsection_escapeable_char(c: u8) -> bool {
+fn is_subsection_escapable_char(c: u8) -> bool {
     c != b'\n'
 }
 

gix-dir/src/walk/classify.rs

@@ -249,7 +249,7 @@ pub fn path(
         return Ok(out.with_status(status).with_kind(kind, index_kind));
     }
 
-    debug_assert!(maybe_status.is_none(), "It only communicates a single stae right now");
+    debug_assert!(maybe_status.is_none(), "It only communicates a single state right now");
     if let Some(excluded) = ctx
         .excludes
         .as_mut()

gix-dir/src/walk/mod.rs

@@ -98,7 +98,7 @@ pub trait Delegate {
 pub enum EmissionMode {
     /// Emit each entry as it matches exactly, without doing any kind of simplification.
     ///
-    /// Emissions in this mode are happening as they occour, without any buffering or ordering.
+    /// Emissions in this mode are happening as they occur, without any buffering or ordering.
     #[default]
     Matching,
     /// Emit only a containing directory if all of its entries are of the same type.
@@ -215,7 +215,7 @@ pub struct Context<'a> {
     /// ### Important
     ///
     /// The index must have been validated so that each entry that is considered up-to-date will have the [gix_index::entry::Flags::UPTODATE] flag
-    /// set. Otherwise the index entry is not considered and a disk-access may occour which is costly.
+    /// set. Otherwise the index entry is not considered and a disk-access may occur which is costly.
     pub index: &'a gix_index::State,
     /// A utility to lookup index entries faster, and deal with ignore-case handling.
     ///

gix-dir/tests/walk/mod.rs

@@ -1605,7 +1605,7 @@ fn expendable_and_precious_in_ignored_dir_with_pathspec() -> crate::Result {
         "with pathspec, we match what's inside and expect to have all the lowest-level paths that have 'ignored' in them.\
          It seems strange that 'precious' isn't precious, while 'all-precious' is. However, the ignore-search is special
          as it goes backward through directories (using directory-declarations), and aborts if it matched. Thus it finds
-         that '$/all-precious/' matched, but in the other cases it maches 'ignored/'.
+         that '$/all-precious/' matched, but in the other cases it matches 'ignored/'.
         'other' gets folded and inherits, just like before.
         Also, look how the ignore-state overrides the prune-default for DotGit kinds, to have more finegrained classification."
     );

gix-filter/tests/eol/convert_to_worktree.rs

@@ -59,7 +59,7 @@ fn no_conversion_if_nothing_to_do() -> crate::Result {
             "mixed crlf and lf is avoided",
         ),
         (
-            &b"elligible-but-disabled\nhere"[..],
+            &b"eligible-but-disabled\nhere"[..],
             AttributesDigest::Binary,
             "designated binary is never handled",
         ),

gix-filter/tests/fixtures/baseline.sh

@@ -17,7 +17,7 @@ function repo_assertions() {
 
   git config filter.arrow.clean "$driver clean %f"
   git config filter.arrow.smudge "$driver smudge %f"
-  git config filter.arrow.requred true
+  git config filter.arrow.required true
 
   repo_assertions
 )
@@ -26,7 +26,7 @@ function repo_assertions() {
   git init process && cd process
 
   git config filter.arrow.process "$driver process"
-  git config filter.arrow.requred true
+  git config filter.arrow.required true
 
   repo_assertions
 )
@@ -35,7 +35,7 @@ function repo_assertions() {
   git init process-no-delay && cd process-no-delay
 
   git config filter.arrow.process "$driver process disallow-delay"
-  git config filter.arrow.requred true
+  git config filter.arrow.required true
 
   repo_assertions
 )