diff --git a/.travis.yml b/.travis.yml index 7858272cc..62113a74d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: # - osx env: - # sphinx v1.8.0 is bugged & fails for linux builds; so, force specfic `sphinx` version + # sphinx v1.8.0 is bugged & fails for linux builds; so, force specific `sphinx` version global: FEATURES='' TEST_INSTALL='' SPHINX_VERSIONED='sphinx==1.7.8' matrix: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11ccca62a..0123c298e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ search the issues to make sure no one else is working on it. ## Commit messages To help the project maintainers review pull requests from contributors across -numerous utilites, the team has settled on conventions for commit messages. +numerous utilities, the team has settled on conventions for commit messages. From http://git-scm.com/book/ch5-2.html: diff --git a/Cargo.toml b/Cargo.toml index 5bd4cc16f..ecdd024c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -161,7 +161,7 @@ feat_require_unix = [ "uname", "unlink", ] -# "feat_require_unix_utmpx" == set of utilites requiring unix utmp/utmpx support +# "feat_require_unix_utmpx" == set of utilities requiring unix utmp/utmpx support # * ref: feat_require_unix_utmpx = [ "pinky", @@ -170,7 +170,7 @@ feat_require_unix_utmpx = [ "who", ] ## (alternate/newer/smaller platforms) feature sets -# "feat_os_unix_fuchsia" == set of utilities which can be built/run on the "Fuschia" OS (refs: ; ) +# "feat_os_unix_fuchsia" == set of utilities which can be built/run on the "Fuchsia" OS (refs: ; ) feat_os_unix_fuchsia = [ "feat_common_core", # diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index 477db9599..67652e4ff 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -59,7 +59,7 @@ quick_error! { cause(err) } - /// Uknown Filetype classification + /// Unknown Filetype classification UnknownFiletype(path: String) { display("cat: {0}: unknown filetype", path) } diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index 71cd1b82f..5819f118a 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -84,7 +84,7 @@ pub fn uumain(mut args: Vec) -> i32 { .opt_str("reference") .and_then(|ref fref| match fs::metadata(fref) { Ok(meta) => Some(meta.mode()), - Err(err) => crash!(1, "cannot stat attribues of '{}': {}", fref, err), + Err(err) => crash!(1, "cannot stat attributes of '{}': {}", fref, err), }); let cmode = if fmode.is_none() { // If there was a negative option, now it's a good time to diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index baf1a9cd8..74e12c487 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -86,7 +86,7 @@ quick_error! { from(err: &'static str) -> (err.to_string()) } - /// Represents the state when a non-fatal error has occured + /// Represents the state when a non-fatal error has occurred /// and not all files were copied. NotAllFilesCopied {} diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index 5578713e0..81712ad43 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -146,7 +146,7 @@ fn cut_bytes(reader: R, ranges: &[Range], opts: &Options) -> i32 { let mut print_delim = false; for &Range { low, high } in ranges.iter() { - // skip upto low + // skip up to low let orig_pos = cur_pos; loop { match buf_read.select(low - cur_pos, None::<&mut Stdout>) { diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 7b4ff4f0a..bb93d8989 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -36,7 +36,7 @@ const LONG_HELP: &str = " ers of 1000). "; -// TODO: Suport Z & Y (currently limited by size of u64) +// TODO: Support Z & Y (currently limited by size of u64) const UNITS: [(char, u32); 6] = [('E', 6), ('P', 5), ('T', 4), ('G', 3), ('M', 2), ('K', 1)]; struct Options { diff --git a/src/uu/hashsum/src/digest.rs b/src/uu/hashsum/src/digest.rs index d9b885e00..498d01a2d 100644 --- a/src/uu/hashsum/src/digest.rs +++ b/src/uu/hashsum/src/digest.rs @@ -69,7 +69,7 @@ impl Digest for sha1::Sha1 { } } -// Implements the Digest trait for sha2 / sha3 algorithms with fixed ouput +// Implements the Digest trait for sha2 / sha3 algorithms with fixed output macro_rules! impl_digest_sha { ($type: ty, $size: expr) => { impl Digest for $type { @@ -96,7 +96,7 @@ macro_rules! impl_digest_sha { }; } -// Implements the Digest trait for sha2 / sha3 algorithms with variable ouput +// Implements the Digest trait for sha2 / sha3 algorithms with variable output macro_rules! impl_digest_shake { ($type: ty) => { impl Digest for $type { diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index 4aabc758c..9d8dec511 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -247,7 +247,7 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &PathBuf, settings: &Setting Some(basename) => target_dir.join(basename), // This can be None only for "." or "..". Trying // to create a link with such name will fail with - // EEXIST, which agrees with the bahavior of GNU + // EEXIST, which agrees with the behavior of GNU // coreutils. None => target_dir.join(name), } diff --git a/src/uu/od/src/multifilereader.rs b/src/uu/od/src/multifilereader.rs index 48951db94..e61ce8614 100644 --- a/src/uu/od/src/multifilereader.rs +++ b/src/uu/od/src/multifilereader.rs @@ -83,7 +83,7 @@ impl<'b> io::Read for MultifileReader<'b> { // If any call returns short (< buf.len()), all subsequent calls will return Ok<0> fn read(&mut self, buf: &mut [u8]) -> io::Result { let mut xfrd = 0; - // while buffer we are filling is not full.. May go thru several files. + // while buffer we are filling is not full.. May go through several files. 'fillloop: while xfrd < buf.len() { match self.curr_file { None => break, diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 9e7573c25..fcdc9499c 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -139,9 +139,9 @@ fn print_usage(opts: &Options) { ptx -G [OPTION]... [INPUT [OUTPUT]] \n Output a permuted index, \ including context, of the words in the input files. \n\n Mandatory \ arguments to long options are mandatory for short options too."; - let explaination = "With no FILE, or when FILE is -, read standard input. \ + let explanation = "With no FILE, or when FILE is -, read standard input. \ Default is '-F /'."; - println!("{}\n{}", opts.usage(&brief), explaination); + println!("{}\n{}", opts.usage(&brief), explanation); } fn get_config(matches: &Matches) -> Config { diff --git a/tests/test_who.rs b/tests/test_who.rs index 33ade0b21..fb667a9ac 100644 --- a/tests/test_who.rs +++ b/tests/test_who.rs @@ -22,7 +22,7 @@ fn test_boot() { fn test_heading() { for opt in vec!["-H"] { // allow whitespace variation - // * minor whitespace differences occur between platform built-in outputs; specfically number of TABs between "TIME" and "COMMENT" may be variant + // * minor whitespace differences occur between platform built-in outputs; specifically number of TABs between "TIME" and "COMMENT" may be variant let actual = new_ucmd!().arg(opt).run().stdout; let expect = expected_result(opt); println!("actual: {:?}", actual);