Skip to content

Commit 39f35da

Browse files
authored
Merge pull request #1248 from joshtriplett/tyop
Typo fixes
2 parents 1ba9488 + 3ef3bc2 commit 39f35da

File tree

39 files changed

+48
-48
lines changed

39 files changed

+48
-48
lines changed

Diff for: gitoxide-core/src/corpus/db.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub fn create(path: impl AsRef<std::path::Path>) -> anyhow::Result<rusqlite::Con
131131
task integer,
132132
gitoxide_version integer,
133133
insertion_time integer NOT NULL, -- in seconds since UNIX epoch
134-
duration real, -- in seconds or NULL if not yet finished (either successfull or with failure)
134+
duration real, -- in seconds or NULL if not yet finished (either successful or with failure)
135135
error text, -- or NULL if there was no error
136136
spans_json text, -- all spans collecteted while performing the run
137137
FOREIGN KEY (repository) REFERENCES repository (id),

Diff for: gitoxide-core/src/repository/commitgraph/list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) mod function {
2727
let commits = id
2828
.object()?
2929
.peel_to_kind(gix::object::Kind::Commit)
30-
.context("Need commitish as starting point")?
30+
.context("Need committish as starting point")?
3131
.id()
3232
.ancestors()
3333
.sorting(Sorting::ByCommitTimeNewestFirst)

Diff for: gitoxide-core/src/repository/fsck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn function(mut repo: gix::Repository, spec: Option<String>, mut out: impl s
1414
let commits: gix::revision::Walk<'_> = id
1515
.object()?
1616
.peel_to_kind(gix::object::Kind::Commit)
17-
.context("Need commitish as starting point")?
17+
.context("Need committish as starting point")?
1818
.id()
1919
.ancestors()
2020
.all()?;

Diff for: gitoxide-core/src/repository/revision/list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub(crate) mod function {
4949
let commits = id
5050
.object()?
5151
.peel_to_kind(gix::object::Kind::Commit)
52-
.context("Need commitish as starting point")?
52+
.context("Need committish as starting point")?
5353
.id()
5454
.ancestors()
5555
.sorting(Sorting::ByCommitTimeNewestFirst)

Diff for: gix-command/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ mod prepare {
8686

8787
/// Builder
8888
impl Prepare {
89-
/// If called, the command will not be executed directly, but with `sh`, but ony if the
89+
/// If called, the command will not be executed directly, but with `sh`, but only if the
9090
/// command passed to [`prepare`](super::prepare()) requires this.
9191
///
9292
/// This also allows to pass shell scripts as command, or use commands that contain arguments which are subsequently

Diff for: gix-commitgraph/src/file/access.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl File {
1616
self.base_graph_count
1717
}
1818

19-
/// Returns the commit data for the commit located at the given lexigraphical position.
19+
/// Returns the commit data for the commit located at the given lexicographical position.
2020
///
2121
/// `pos` must range from 0 to `self.num_commits()`.
2222
///
@@ -40,7 +40,7 @@ impl File {
4040
pub fn id_at(&self, pos: file::Position) -> &gix_hash::oid {
4141
assert!(
4242
pos.0 < self.num_commits(),
43-
"expected lexigraphical position less than {}, got {}",
43+
"expected lexicographical position less than {}, got {}",
4444
self.num_commits(),
4545
pos.0
4646
);
@@ -115,7 +115,7 @@ impl File {
115115
pub(crate) fn commit_data_bytes(&self, pos: file::Position) -> &[u8] {
116116
assert!(
117117
pos.0 < self.num_commits(),
118-
"expected lexigraphical position less than {}, got {}",
118+
"expected lexicographical position less than {}, got {}",
119119
self.num_commits(),
120120
pos.0
121121
);

Diff for: gix-config-value/fuzz/fuzz_targets/fuzz_value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn fuzz(ctx: Ctx) -> Result<()> {
4747

4848
fuzz_target!(|ctx: Ctx| {
4949
if let Err(e) = fuzz(ctx) {
50-
// Excersize display/debug fmt code.
50+
// Exercise display/debug fmt code.
5151
_ = black_box(format!("{e} {e:?}"));
5252
}
5353
});

Diff for: gix-diff/src/blob/platform.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub mod prepare_diff {
193193
/// is `false`.
194194
///
195195
/// Use [`Outcome::interned_input()`] to easily obtain an interner for use with [`imara_diff::diff()`], or maintain one yourself
196-
/// for greater re-use.
196+
/// for greater reuse.
197197
InternalDiff {
198198
/// The algorithm we determined should be used, which is one of (in order, first set one wins):
199199
///
@@ -349,7 +349,7 @@ impl Platform {
349349
///
350350
/// ### Important
351351
///
352-
/// If an error occours, the previous resource of `kind` will be cleared, preventing further diffs
352+
/// If an error occurs, the previous resource of `kind` will be cleared, preventing further diffs
353353
/// unless another attempt succeeds.
354354
pub fn set_resource(
355355
&mut self,
780 Bytes
Binary file not shown.

Diff for: gix-features/src/interrupt.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ where
8989
}
9090
}
9191

92-
/// A wrapper for implementors of [`std::io::Read`] or [`std::io::BufRead`] with interrupt support.
92+
/// A wrapper for implementers of [`std::io::Read`] or [`std::io::BufRead`] with interrupt support.
9393
///
9494
/// It fails a [read][std::io::Read::read] while an interrupt was requested.
9595
pub struct Read<'a, R> {
@@ -124,7 +124,7 @@ where
124124
}
125125
}
126126

127-
/// A wrapper for implementors of [`std::io::Write`] with interrupt checks on each write call.
127+
/// A wrapper for implementers of [`std::io::Write`] with interrupt checks on each write call.
128128
///
129129
/// It fails a [write][std::io::Write::write] while an interrupt was requested.
130130
pub struct Write<'a, W> {

Diff for: gix-filter/src/driver/shutdown.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub enum Mode {
1414

1515
/// Lifecycle
1616
impl State {
17-
/// Handle long-running processes according to `mode`. If an error occours, all remaining processes will be ignored automatically.
17+
/// Handle long-running processes according to `mode`. If an error occurs, all remaining processes will be ignored automatically.
1818
/// Return a list of `(process, Option<status>)`
1919
pub fn shutdown(self, mode: Mode) -> Result<Vec<(BString, Option<std::process::ExitStatus>)>, std::io::Error> {
2020
let mut out = Vec::with_capacity(self.running.len());

Diff for: gix-filter/src/pipeline/convert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ pub enum ToGitOutcome<'pipeline, R> {
242242
///
243243
/// ### Panics
244244
///
245-
/// If `std::io::Read` is used on it and the output is delayed, a panic will occour. The caller is responsible for either disallowing delayed
245+
/// If `std::io::Read` is used on it and the output is delayed, a panic will occur. The caller is responsible for either disallowing delayed
246246
/// results or if allowed, handle them. Use [`is_delayed()][Self::is_delayed()].
247247
pub enum ToWorktreeOutcome<'input, 'pipeline> {
248248
/// The original input wasn't changed and the original buffer is present

Diff for: gix-filter/src/pipeline/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl Pipeline {
103103
&mut self.options
104104
}
105105

106-
/// Return our double-buffers for re-use by the caller.
106+
/// Return our double-buffers for reuse by the caller.
107107
pub fn buffers_mut(&mut self) -> &mut gix_utils::Buffers {
108108
&mut self.bufs
109109
}

Diff for: gix-filter/tests/eol/convert_to_git.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn crlf_in_index_prevents_conversion_to_lf() -> crate::Result {
101101
let mut buf = Vec::new();
102102
let mut called = false;
103103
let changed = eol::convert_to_git(
104-
b"elligible\n",
104+
b"eligible\n",
105105
AttributesDigest::TextAutoInput,
106106
&mut buf,
107107
&mut |buf| {

Diff for: gix-index/src/extension/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct Iter<'a> {
1616

1717
/// A structure to associate object ids of a tree with sections in the index entries list.
1818
///
19-
/// It allows to more quickly build trees by avoiding as it can quickly re-use portions of the index and its associated tree ids
19+
/// It allows to more quickly build trees by avoiding as it can quickly reuse portions of the index and its associated tree ids
2020
/// if there was no change to them. Portions of this tree are invalidated as the index is changed.
2121
#[derive(PartialEq, Eq, Clone, Debug)]
2222
pub struct Tree {

Diff for: gix-index/src/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl Metadata {
7373

7474
/// Return the time at which the underlying file was created.
7575
///
76-
/// Note that this differes from [`std::fs::Metadata::created()`] which would return
76+
/// Note that this differs from [`std::fs::Metadata::created()`] which would return
7777
/// the inode birth time, which is notably different to what `git` does.
7878
pub fn created(&self) -> Option<SystemTime> {
7979
#[cfg(not(windows))]

Diff for: gix-index/src/write.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{entry, extension, write::util::CountBytes, State, Version};
55
/// A way to specify which of the optional extensions to write.
66
#[derive(Default, Debug, Copy, Clone)]
77
pub enum Extensions {
8-
/// Writes all available optional extensions to avoid loosing any information.
8+
/// Writes all available optional extensions to avoid losing any information.
99
#[default]
1010
All,
1111
/// Only write the given optional extensions, with each extension being marked by a boolean flag.

Diff for: gix-odb/src/store_impls/dynamic/verify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub mod integrity {
6666
#[derive(Debug, PartialEq, Eq, Hash, Ord, PartialOrd, Clone)]
6767
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
6868
pub struct IndexStatistics {
69-
/// The path to the index or multi-pack index for which statics were gathered.
69+
/// The path to the index or multi-pack index for which statistics were gathered.
7070
pub path: PathBuf,
7171
/// The actual statistics for the index at `path`.
7272
pub statistics: SingleOrMultiStatistics,

Diff for: gix-pack/src/cache/object.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! This module is a bit 'misplaced' if spelled out like '`gix_pack::cache::object::`*' but is best placed here for code re-use and
1+
//! This module is a bit 'misplaced' if spelled out like '`gix_pack::cache::object::`*' but is best placed here for code reuse and
22
//! general usefulness.
33
use crate::cache;
44

Diff for: gix-pathspec/src/search/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl Search {
3131
/// there is none. It doesn't have to end at a directory boundary though, nor does it denote a directory.
3232
///
3333
/// Note that the common_prefix is always matched case-sensitively, and it is useful to skip large portions of input.
34-
/// Further, excluded pathspecs don't participate which makes this common prefix inclusive. To work correclty though,
34+
/// Further, excluded pathspecs don't participate which makes this common prefix inclusive. To work correctly though,
3535
/// one will have to additionally match paths that have the common prefix with that pathspec itself to assure it is
3636
/// not excluded.
3737
pub fn common_prefix(&self) -> &BStr {

Diff for: gix-sec/src/identity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ mod impl_ {
133133
// Admin-group owned folders are considered owned by the current user, if they are in the admin group
134134
if !is_owned && IsWellKnownSid(token_owner, WinBuiltinAdministratorsSid).as_bool() {
135135
let mut is_member = BOOL::default();
136-
// TODO: re-use the handle
136+
// TODO: reuse the handle
137137
match CheckTokenMembership(HANDLE::default(), token_owner, &mut is_member) {
138138
Err(e) => {
139139
err_msg = Some(format!("Couldn't check if user is an administrator: {}", e))

Diff for: gix-status/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub trait Pathspec {
1919
/// there is none. It doesn't have to end at a directory boundary though, nor does it denote a directory.
2020
///
2121
/// Note that the common_prefix is always matched case-sensitively, and it is useful to skip large portions of input.
22-
/// Further, excluded pathspecs don't participate which makes this common prefix inclusive. To work correclty though,
22+
/// Further, excluded pathspecs don't participate which makes this common prefix inclusive. To work correctly though,
2323
/// one will have to additionally match paths that have the common prefix with that pathspec itself to assure it is
2424
/// not excluded.
2525
fn common_prefix(&self) -> &BStr;

Diff for: gix-status/tests/status/index_as_worktree.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn fixture_filtered_detailed(
6868
mut prepare_index: impl FnMut(&mut gix_index::State),
6969
submodule_dirty: bool,
7070
) -> Outcome {
71-
// This can easily happen in some fixtures, which can cause flakyness. It's time-dependent after all.
71+
// This can easily happen in some fixtures, which can cause flakiness. It's time-dependent after all.
7272
fn ignore_racyclean(mut out: Outcome) -> Outcome {
7373
out.racy_clean = 0;
7474
out
@@ -116,7 +116,7 @@ fn fixture_filtered_detailed(
116116
ignore_racyclean(ignore_updated(ignore_worktree_stats(outcome)))
117117
}
118118

119-
/// Note that we also reset certain information to assure there is no flakyness - everything regarding race-detection otherwise can cause failures.
119+
/// Note that we also reset certain information to assure there is no flakiness - everything regarding race-detection otherwise can cause failures.
120120
fn records_to_tuple<'index>(records: impl IntoIterator<Item = Record<'index, (), ()>>) -> Vec<Expectation<'index>> {
121121
records
122122
.into_iter()

Diff for: gix-trace/src/enabled.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ macro_rules! fieldset {
264264
$crate::fieldset!(@ { $($out),*, $k } $($rest)*)
265265
};
266266

267-
// Remainder is unparseable, but exists --- must be format args!
267+
// Remainder is unparsable, but exists --- must be format args!
268268
(@ { $(,)* $($out:expr),* } $($rest:tt)+) => {
269269
$crate::fieldset!(@ { "message", $($out),*, })
270270
};

Diff for: gix-trace/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! A crate providing macros for creating spans in various detail levels. `coarse!` shoudl be used for top-level operations, whereas
1+
//! A crate providing macros for creating spans in various detail levels. `coarse!` should be used for top-level operations, whereas
22
//! `detail!` should be used in plumbing crates unless their operations are likely to cost a lot of time.
33
//!
44
//! The application is supposed to explicitly turn on tracing via `gix-features`.

Diff for: gix-traverse/src/tree/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub mod visit {
4747
pub enum Action {
4848
/// Continue the traversal of entries.
4949
Continue,
50-
/// Stop the traversal of entries, making this te last call to [`visit_(tree|nontree)(…)`][super::Visit::visit_nontree()].
50+
/// Stop the traversal of entries, making this the last call to [`visit_(tree|nontree)(…)`][super::Visit::visit_nontree()].
5151
Cancel,
5252
/// Don't dive into the entry, skipping children effectively. Only useful in [`visit_tree(…)`][super::Visit::visit_tree()].
5353
Skip,

Diff for: gix-url/tests/baseline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn run() {
5050

5151
assert_ne!(test_count, 0, "the baseline is never empty");
5252
if failures.is_empty() {
53-
todo!("The baseline is currently meddling with hooks, thats not needed anymore since the failure rate is 0: move this into a module of the normal tests");
53+
todo!("The baseline is currently meddling with hooks, that's not needed anymore since the failure rate is 0: move this into a module of the normal tests");
5454
}
5555

5656
let failure_count = failures.len();

Diff for: gix-url/tests/parse/file.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fn no_relative_paths_if_protocol() -> crate::Result {
102102
assert_matches::assert_matches!(
103103
gix_url::parse("file://.\\".into()),
104104
Err(gix_url::parse::Error::MissingRepositoryPath { .. }),
105-
"DEVIATION: on windows, this parses with git into something nonesensical Diag: url=file://./ Diag: protocol=file Diag: hostandport=./ Diag: path=//./"
105+
"DEVIATION: on windows, this parses with git into something nonsensical Diag: url=file://./ Diag: protocol=file Diag: hostandport=./ Diag: path=//./"
106106
);
107107
}
108108
Ok(())

Diff for: gix/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ default = ["max-performance-safe", "comfort", "basic", "extras"]
2626
#! enabled as long as it doesn't sacrifice compatibility. Most users will be fine with that but will pay with higher compile times than necessary as they
2727
#! probably don't use all of these features.
2828
#!
29-
#! **Thus it's recommended to take a moment and optimize build times by chosing only those 'Components' that you require.** *'Performance' relevant features should
29+
#! **Thus it's recommended to take a moment and optimize build times by choosing only those 'Components' that you require.** *'Performance' relevant features should
3030
#! be chosen next to maximize efficiency.*
3131
#!
3232
#! #### Application Developers
@@ -121,11 +121,11 @@ async-network-client = ["gix-protocol/async-client", "gix-pack/streaming-input",
121121
async-network-client-async-std = ["async-std", "async-network-client", "gix-transport/async-std"]
122122
## Make `gix-protocol` available along with a blocking client, providing access to the `file://`, git://` and `ssh://` transports.
123123
blocking-network-client = ["gix-protocol/blocking-client", "gix-pack/streaming-input", "attributes", "credentials"]
124-
## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole, making the `https://` transport avaialble.
124+
## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole, making the `https://` transport available.
125125
blocking-http-transport-curl = ["blocking-network-client", "gix-transport/http-client-curl"]
126126
## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
127127
blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl-for-configuration-only", "curl-for-configuration-only?/rustls"]
128-
## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole, making the `https://` transport avaialble.
128+
## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole, making the `https://` transport available.
129129
blocking-http-transport-reqwest = ["blocking-network-client", "gix-transport/http-client-reqwest"]
130130
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
131131
blocking-http-transport-reqwest-rust-tls = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/rustls-tls" ]
@@ -139,7 +139,7 @@ blocking-http-transport-reqwest-native-tls = ["blocking-http-transport-reqwest",
139139
#! #### Performance
140140
#!
141141
#! The reason these features exist is to allow optimization for compile time and optimize for compatibility by default. This means that some performance options around
142-
#! SHA1 and ZIP might not compile on all platforms, so it depeneds on the end-user who compiles the application to chose these based on their needs.
142+
#! SHA1 and ZIP might not compile on all platforms, so it depends on the end-user who compiles the application to chose these based on their needs.
143143

144144
## Activate features that maximize performance, like usage of threads, `zlib-ng` and access to caching in object databases, skipping the ones known to cause compile failures
145145
## on some platforms.

Diff for: gix/src/assets/init/info/exclude

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Thise file contains repository-wide exclude patterns that git will ignore.
1+
# This file contains repository-wide exclude patterns that git will ignore.
22
# They are local and will not be shared when pushing or pulling.
33
# When using Rust the following would be typical exclude patterns.
44
# Remove the '# ' prefix to let them take effect.

Diff for: gix/src/config/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pub mod diff {
144144
#[derive(Debug, thiserror::Error)]
145145
#[error("Failed to parse value of 'diff.{name}.{attribute}'")]
146146
pub struct Error {
147-
/// The name fo the driver.
147+
/// The name of the driver.
148148
pub name: BString,
149149
/// The name of the attribute we tried to parse.
150150
pub attribute: &'static str,
@@ -604,7 +604,7 @@ pub(crate) struct Cache {
604604
// TODO: make core.precomposeUnicode available as well.
605605
}
606606

607-
/// Utillities shared privately across the crate, for lack of a better place.
607+
/// Utilities shared privately across the crate, for lack of a better place.
608608
pub(crate) mod shared {
609609
use crate::{
610610
config,

Diff for: gix/src/interrupt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ where
193193
}
194194
}
195195

196-
/// A wrapper for implementors of [`std::io::Read`] or [`std::io::BufRead`] with interrupt support.
196+
/// A wrapper for implementers of [`std::io::Read`] or [`std::io::BufRead`] with interrupt support.
197197
///
198198
/// It fails a [read][`std::io::Read::read`] while an interrupt was requested.
199199
pub struct Read<R> {

0 commit comments

Comments
 (0)