Skip to content

Commit f72ecce

Browse files
committed
Fix typos
1 parent b7ab287 commit f72ecce

File tree

27 files changed

+62
-49
lines changed

27 files changed

+62
-49
lines changed

.gov/info.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ maintainers:
88
- push directly to 'main' branch
99
- reviews or suggestions by other maintainers if PRs are used
1010
- co-ownership of contributed crates
11-
- reveive sponsorship via GitHub from project page
11+
- receive sponsorship via GitHub from project page
1212

1313

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ small = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend"
6464
## 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
6565
## is very limited to only HTTP (without typical `git` configuration) and git over TCP like provided by the `git daemon`.
6666
##
67-
## 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.
67+
## 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.
6868
##
6969
## Due to async client-networking not being implemented for most transports, this one supports only the 'git+tcp' and HTTP transport.
7070
## It uses, however, a fully asynchronous networking implementation which can serve a real-world example on how to implement custom async transports.

_typos.toml

+25-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,32 @@
1-
[default]
2-
extend-ignore-identifiers-re = [
3-
"[a-f0-9]{7,}",
4-
"[Ff][Oo][Oo]",
5-
"[a-zA-Z0-9]{20,}",
6-
]
7-
81
[files]
92
extend-exclude = [
103
"**/CHANGELOG.md",
11-
"**/tests/fixtures/**",
4+
"*.response",
5+
"etc/corpus/repo_metadata.sample.jsonl",
126
"gix-config/benches/large_config_file.rs",
13-
"gix-glob/tests/wildmatch/mod.rs"
7+
"gix-config/tests/fixtures/clusterfuzz-testcase-minimized-gix-config-parse-6431708583690240",
8+
"gix-glob/tests/wildmatch/mod.rs",
9+
"gix-path/tests/fixtures/fuzzed/54k-path-components.path",
1410
]
11+
ignore-hidden = false
1512

13+
[default]
14+
extend-ignore-re = [
15+
# PGP signature
16+
"[0-9A-Za-z+=]{44,}",
17+
'"egal"',
18+
'"bar", "bart", "ba"',
19+
'"foo/ba"',
20+
'"FO", "FO", &\[\], "FO"',
21+
'"(BarFoO|BarFoOo|FoO|FoOo)"',
22+
"\\|pn: &BStr\\| pn !=",
23+
]
24+
extend-ignore-identifiers-re = [
25+
# Git commit hash
26+
"[0-9a-f]{7,}",
27+
"rela_[a-z_]+",
28+
]
1629

17-
[default.extend-words]
18-
rela = "rela"
19-
unter = "unter"
30+
[default.extend-identifiers]
31+
_pn = "_pn"
32+
ein = "ein"

gitoxide-core/src/repository/clean.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub(crate) mod function {
6060
let index = repo.index_or_empty()?;
6161
let pathspec_for_dirwalk = !pathspec_matches_result;
6262
let has_patterns = !patterns.is_empty();
63-
let mut collect = InterruptableCollect::default();
63+
let mut collect = InterruptibleCollect::default();
6464
let collapse_directories = CollapseDirectory;
6565
let options = repo
6666
.dirwalk_options()?
@@ -365,11 +365,11 @@ pub(crate) mod function {
365365
}
366366

367367
#[derive(Default)]
368-
struct InterruptableCollect {
368+
struct InterruptibleCollect {
369369
inner: gix::dir::walk::delegate::Collect,
370370
}
371371

372-
impl gix::dir::walk::Delegate for InterruptableCollect {
372+
impl gix::dir::walk::Delegate for InterruptibleCollect {
373373
fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option<Status>) -> walk::Action {
374374
let res = self.inner.emit(entry, collapsed_directory_status);
375375
if gix::interrupt::is_triggered() {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ fn subsection_unescaped<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i
190190
}
191191

192192
fn subsection_escaped_char<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i [u8]>> {
193-
preceded('\\', one_of(is_subsection_escapeable_char).recognize()).parse_next(i)
193+
preceded('\\', one_of(is_subsection_escapable_char).recognize()).parse_next(i)
194194
}
195195

196-
fn is_subsection_escapeable_char(c: u8) -> bool {
196+
fn is_subsection_escapable_char(c: u8) -> bool {
197197
c != b'\n'
198198
}
199199

gix-diff/tests/rewrites/tracker.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ fn rename_by_similarity_reports_limit_if_encountered() -> crate::Result {
419419
&mut track,
420420
[
421421
(Change::deletion(), "a", "first\nsecond\n"),
422-
(Change::addition(), "b", "firt\nsecond\n"),
422+
(Change::addition(), "b", "first\nsecond\n"),
423423
(Change::addition(), "c", "second\nunrelated\n"),
424424
],
425425
);
@@ -464,7 +464,7 @@ fn rename_by_50_percent_similarity() -> crate::Result {
464464
&mut track,
465465
[
466466
(Change::deletion(), "a", "first\nsecond\n"),
467-
(Change::addition(), "b", "firt\nsecond\n"),
467+
(Change::addition(), "b", "first\nsecond\n"),
468468
(Change::addition(), "c", "second\nunrelated\n"),
469469
],
470470
);

gix-dir/src/walk/classify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ pub fn path(
249249
return Ok(out.with_status(status).with_kind(kind, index_kind));
250250
}
251251

252-
debug_assert!(maybe_status.is_none(), "It only communicates a single stae right now");
252+
debug_assert!(maybe_status.is_none(), "It only communicates a single state right now");
253253
if let Some(excluded) = ctx
254254
.excludes
255255
.as_mut()

gix-dir/src/walk/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub trait Delegate {
9898
pub enum EmissionMode {
9999
/// Emit each entry as it matches exactly, without doing any kind of simplification.
100100
///
101-
/// Emissions in this mode are happening as they occour, without any buffering or ordering.
101+
/// Emissions in this mode are happening as they occur, without any buffering or ordering.
102102
#[default]
103103
Matching,
104104
/// Emit only a containing directory if all of its entries are of the same type.
@@ -215,7 +215,7 @@ pub struct Context<'a> {
215215
/// ### Important
216216
///
217217
/// 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
218-
/// set. Otherwise the index entry is not considered and a disk-access may occour which is costly.
218+
/// set. Otherwise the index entry is not considered and a disk-access may occur which is costly.
219219
pub index: &'a gix_index::State,
220220
/// A utility to lookup index entries faster, and deal with ignore-case handling.
221221
///

gix-dir/tests/walk/mod.rs

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

gix-filter/tests/eol/convert_to_worktree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn no_conversion_if_nothing_to_do() -> crate::Result {
5959
"mixed crlf and lf is avoided",
6060
),
6161
(
62-
&b"elligible-but-disabled\nhere"[..],
62+
&b"eligible-but-disabled\nhere"[..],
6363
AttributesDigest::Binary,
6464
"designated binary is never handled",
6565
),

gix-filter/tests/fixtures/baseline.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function repo_assertions() {
1717

1818
git config filter.arrow.clean "$driver clean %f"
1919
git config filter.arrow.smudge "$driver smudge %f"
20-
git config filter.arrow.requred true
20+
git config filter.arrow.required true
2121

2222
repo_assertions
2323
)
@@ -26,7 +26,7 @@ function repo_assertions() {
2626
git init process && cd process
2727

2828
git config filter.arrow.process "$driver process"
29-
git config filter.arrow.requred true
29+
git config filter.arrow.required true
3030

3131
repo_assertions
3232
)
@@ -35,7 +35,7 @@ function repo_assertions() {
3535
git init process-no-delay && cd process-no-delay
3636

3737
git config filter.arrow.process "$driver process disallow-delay"
38-
git config filter.arrow.requred true
38+
git config filter.arrow.required true
3939

4040
repo_assertions
4141
)

gix-fs/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::path::PathBuf;
88
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
99
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
1010
pub struct Capabilities {
11-
/// If `true`, the filesystem will consider the precomposed umlaut `ä` similiar to its decomposed form `"a\u{308}"` and consider them the same.
11+
/// If `true`, the filesystem will consider the precomposed umlaut `ä` similar to its decomposed form `"a\u{308}"` and consider them the same.
1212
/// If `false`, the filesystem will only see bytes which means that the above example could live side-by-side.
1313
///
1414
/// Even though a filesystem that treats both forms the same will still reproduce the exact same byte sequence during traversal for instance,

gix-pathspec/src/search/matching.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl Search {
2020
///
2121
/// ### Deviation
2222
///
23-
/// The case-sensivity of the attribute match is controlled by the sensitivity of the pathspec, instead of being based on the
23+
/// The case-sensitivity of the attribute match is controlled by the sensitivity of the pathspec, instead of being based on the
2424
/// case folding settings of the repository. That way we assure that the matching is consistent.
2525
/// Higher-level crates should control this default case folding of pathspecs when instantiating them, which is when they can
2626
/// set it to match the repository setting for more natural behaviour when, for instance, adding files to a repository:

gix-pathspec/tests/search/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ fn init_with_exclude() -> crate::Result {
417417
assert_eq!(search.patterns().count(), 2, "nothing artificial is added");
418418
assert!(
419419
search.patterns().next().expect("first of two").is_excluded(),
420-
"re-orded so that excluded are first"
420+
"re-ordered so that excluded are first"
421421
);
422422
assert_eq!(search.common_prefix(), "tests");
423423
assert_eq!(

gix-status/src/index_as_worktree/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct Options {
3838
pub struct Context<'a> {
3939
/// The pathspec to limit the amount of paths that are checked. Can be empty to allow all paths.
4040
///
41-
/// Note that these are expected to have a [commont_prefix()](gix_pathspec::Search::common_prefix()) according
41+
/// Note that these are expected to have a [common_prefix()](gix_pathspec::Search::common_prefix()) according
4242
/// to the prefix of the repository to efficiently limit the scope of the paths we process.
4343
pub pathspec: gix_pathspec::Search,
4444
/// A stack pre-configured to allow accessing attributes for each entry, as required for `filter`

gix-status/src/index_as_worktree_with_renames/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,15 @@ pub struct Options {
306306
/// the latency until the first entries are received. Note that some entries are never candidates for renames, which means
307307
/// they are forwarded to the caller right away.
308308
///
309-
/// If `None`, no tracking will occour, which means that all output becomes visible to the delegate immediately.
309+
/// If `None`, no tracking will occur, which means that all output becomes visible to the delegate immediately.
310310
pub rewrites: Option<gix_diff::Rewrites>,
311311
}
312312

313313
/// The context for [index_as_worktree_with_renames()`](crate::index_as_worktree_with_renames()).
314314
pub struct Context<'a> {
315315
/// The pathspec to limit the amount of paths that are checked. Can be empty to allow all paths.
316316
///
317-
/// Note that these are expected to have a [commont_prefix()](gix_pathspec::Search::common_prefix()) according
317+
/// Note that these are expected to have a [common_prefix()](gix_pathspec::Search::common_prefix()) according
318318
/// to the prefix of the repository to efficiently limit the scope of the paths we process, both for the
319319
/// index modifications as well as for the directory walk.
320320
pub pathspec: gix_pathspec::Search,

gix-trace/tests/trace.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use gix_trace::{coarse, debug, detail, error, event, info, span, trace, warn};
22
#[test]
33
fn span() {
44
let _x = span!(gix_trace::Level::Coarse, "hello");
5-
let fourty_two = span!(gix_trace::Level::Coarse, "hello", x = "value", y = 42).into_scope(|| 42);
6-
assert_eq!(fourty_two, 42);
5+
let forty_two = span!(gix_trace::Level::Coarse, "hello", x = "value", y = 42).into_scope(|| 42);
6+
assert_eq!(forty_two, 42);
77
let span = span!(target: "other", gix_trace::Level::Coarse, "hello", x = "value", y = 42);
88
span.record("y", "hello").record("x", 36);
99
}

gix-transport/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ http-client = [
3030
]
3131
## Implies `http-client`, and adds support for the http and https transports using the Rust bindings for `libcurl`.
3232
http-client-curl = ["curl", "http-client"]
33-
## Implies `http-client-curl` and enables `rustls` for creationg `https://` connections.
33+
## Implies `http-client-curl` and enables `rustls` for creating `https://` connections.
3434
http-client-curl-rust-tls = ["http-client-curl", "curl/rustls"]
3535
### Implies `http-client` and adds support for http and https transports using the blocking version of `reqwest`.
3636
http-client-reqwest = ["reqwest", "http-client"]

gix-traverse/src/commit/simple.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ mod init {
167167
}
168168
}
169169

170-
/// Lifecyle
170+
/// Lifecycle
171171
impl<Find> Simple<Find, fn(&oid) -> bool>
172172
where
173173
Find: gix_object::Find,
@@ -185,7 +185,7 @@ mod init {
185185
}
186186
}
187187

188-
/// Lifecyle
188+
/// Lifecycle
189189
impl<Find, Predicate> Simple<Find, Predicate>
190190
where
191191
Find: gix_object::Find,

gix-utils/src/btoi.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ pub fn to_signed<I: MinNumTraits>(bytes: &[u8]) -> Result<I, ParseIntegerError>
195195
/// Returns [`ParseIntegerError`] for any of the following conditions:
196196
///
197197
/// * `bytes` has no digits
198-
/// * not all characters of `bytes` are `0-9`, `a-z`, `A-Z`, exluding an
198+
/// * not all characters of `bytes` are `0-9`, `a-z`, `A-Z`, excluding an
199199
/// optional leading sign
200-
/// * not all characters refer to digits in the given `radix`, exluding an
200+
/// * not all characters refer to digits in the given `radix`, excluding an
201201
/// optional leading sign
202202
/// * the number overflows or underflows `I`
203203
///
@@ -272,7 +272,7 @@ pub fn to_signed_with_radix<I: MinNumTraits>(bytes: &[u8], radix: u32) -> Result
272272
pub trait MinNumTraits: Sized + Copy + TryFrom<u32> {
273273
/// the 0 value for this type
274274
const ZERO: Self;
275-
/// convert from a unsinged 32-bit word
275+
/// convert from a unsigned 32-bit word
276276
fn from_u32(n: u32) -> Option<Self> {
277277
Self::try_from(n).ok()
278278
}

gix/src/status/index_worktree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ mod submodule_status {
279279
/// ### Parallel Operation
280280
///
281281
/// Note that without the `parallel` feature, the iterator becomes 'serial', which means all status will be computed in advance
282-
/// and it's non-interruptable, yielding worse performance for is-dirty checks for instance as interruptions won't happen.
282+
/// and it's non-interruptible, yielding worse performance for is-dirty checks for instance as interruptions won't happen.
283283
/// It's a crutch that is just there to make single-threaded applications possible at all, as it's not really an iterator
284284
/// anymore. If this matters, better run [Repository::index_worktree_status()] by hand as it provides all control one would need,
285285
/// just not as an iterator.

gix/src/submodule/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,15 @@ pub mod status {
385385
if !state.worktree_checkout {
386386
return Ok(status);
387387
}
388-
let statusses = adjust_options(sm_repo.status(gix_features::progress::Discard)?)
388+
let statuses = adjust_options(sm_repo.status(gix_features::progress::Discard)?)
389389
.index_worktree_options_mut(|opts| {
390390
if ignore == config::Ignore::Untracked {
391391
opts.dirwalk_options = None;
392392
}
393393
})
394394
.into_index_worktree_iter(Vec::new())?;
395395
let mut changes = Vec::new();
396-
for change in statusses {
396+
for change in statuses {
397397
changes.push(change?);
398398
}
399399
status.changes = Some(changes);

gix/tests/fixtures/make_remote_repos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ [email protected]
2222
GIT_COMMITTER_NAME='C O Mitter'
2323
GIT_COMMITTER_DATE='1112354055 +0200'
2424

25-
# runup to the correct count for ambigous commits
25+
# runup to the correct count for ambiguous commits
2626
tick; tick; tick; tick; tick
2727

2828
git init base

gix/tests/status/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ mod is_dirty {
144144
#[test]
145145
fn submodule_changes_are_picked_up() -> crate::Result {
146146
let repo = submodule_repo("submodule-head-changed")?;
147-
assert!(repo.is_dirty()?, "head-changes are also discoverd");
147+
assert!(repo.is_dirty()?, "head-changes are also discovered");
148148
Ok(())
149149
}
150150

src/plumbing/progress.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static GIT_CONFIG: &[Record] = &[
263263
},
264264
Record {
265265
config: "fetch.showForcedUpdates",
266-
usage: NotApplicable("we don't support advices")
266+
usage: NotApplicable("we don't support advice")
267267
},
268268
Record {
269269
config: "fetch.output",

0 commit comments

Comments
 (0)