Skip to content

Commit

Permalink
Merge pull request #1314 from avoidalone/main
Browse files Browse the repository at this point in the history
chore: remove repetitive words
  • Loading branch information
Byron committed Mar 11, 2024
2 parents 9e9b9fe + 39879af commit 5722e3a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gix-command/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub struct Prepare {
pub struct Context {
/// The `.git` directory that contains the repository.
///
/// If set, it will be used to set the the `GIT_DIR` environment variable.
/// If set, it will be used to set the `GIT_DIR` environment variable.
pub git_dir: Option<PathBuf>,
/// Set the `GIT_WORK_TREE` environment variable with the given path.
pub worktree_dir: Option<PathBuf>,
Expand Down
2 changes: 1 addition & 1 deletion gix-commitgraph/tests/access/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn single_commit_future_64bit_dates_work() {
assert_eq!(
actual.committer_timestamp(),
info.time.seconds.try_into().expect("timestamps in bound"),
"this is close the the highest representable value in the graph, like year 2500, so we are good for longer than I should care about"
"this is close the highest representable value in the graph, like year 2500, so we are good for longer than I should care about"
);
assert_eq!(actual.generation(), 1);
}
Expand Down
2 changes: 1 addition & 1 deletion gix-pack/src/cache/lru.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ mod _static {
if data.len() > self.mem_limit {
return;
}
// If we could hold it but are are at limit, all we can do is make space.
// If we could hold it but are at limit, all we can do is make space.
let mem_free = self.mem_limit - self.mem_used;
if data.len() > mem_free {
// prefer freeing free-lists instead of clearing our cache
Expand Down
2 changes: 1 addition & 1 deletion gix-packetline/src/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{PacketLineRef, DELIMITER_LINE, FLUSH_LINE, MAX_DATA_LEN, MAX_LINE_LE
pub enum Error {
#[error("Failed to decode the first four hex bytes indicating the line length: {err}")]
HexDecode { err: String },
#[error("The data received claims to be larger than than the maximum allowed size: got {length_in_bytes}, exceeds {MAX_DATA_LEN}")]
#[error("The data received claims to be larger than the maximum allowed size: got {length_in_bytes}, exceeds {MAX_DATA_LEN}")]
DataLengthLimitExceeded { length_in_bytes: usize },
#[error("Received an invalid empty line")]
DataIsEmpty,
Expand Down
2 changes: 1 addition & 1 deletion gix-packetline/tests/decode/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ mod streaming {
fn error_on_oversized_line() {
assert_err_display(
streaming(b"ffff"),
"The data received claims to be larger than than the maximum allowed size: got 65535, exceeds 65516",
"The data received claims to be larger than the maximum allowed size: got 65535, exceeds 65516",
);
}

Expand Down

0 comments on commit 5722e3a

Please sign in to comment.