Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use thiserror::Error;
use log::debug;
use wait_timeout::ChildExt;

/// An error occuring during git command execution
/// An error occurring during git command execution
#[derive(Debug, Error)]
pub enum GitError {
#[error("Command {cmd_str} failed with system error: {err}")]
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use slug::slugify;
#[macro_use]
extern crate serde_derive;

// Used to allow multiple paralell sync tasks
// Used to allow multiple parallel sync tasks
use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};

// Time handling
Expand Down Expand Up @@ -313,7 +313,7 @@ pub fn do_mirror(provider: Box<dyn Provider>, opts: &MirrorOptions) -> Result<()
))
})?;

trace!("Aquired lockfile: {:?}", &lockfile);
trace!("Acquired lockfile: {:?}", &lockfile);

// Get the list of repos to sync from gitlabsss
let v = provider.get_mirror_repos().map_err(|e| -> GitMirrorError {
Expand Down Expand Up @@ -353,8 +353,8 @@ pub fn do_mirror(provider: Box<dyn Provider>, opts: &MirrorOptions) -> Result<()
fn write_metrics(f: &Path) {
let mut file = File::create(f).unwrap();
let encoder = TextEncoder::new();
let metric_familys = prometheus::gather();
encoder.encode(&metric_familys, &mut file).unwrap();
let metric_families = prometheus::gather();
encoder.encode(&metric_families, &mut file).unwrap();
}

fn write_junit_report(f: &Path, ts: TestSuite) {
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ fn main() {
info!("All done");
}
Err(e) => {
error!("Error occured: {e}");
error!("Error occurred: {e}");
exit(e.into());
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/provider/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub struct Mirror {
pub lfs: bool,
}

/// An error occuring during mirror creation
/// An error occurring during mirror creation
#[derive(Debug, Error)]
pub enum MirrorError {
#[error("data store disconnected")]
Expand Down
Loading