diff --git a/.appveyor.yml b/.appveyor.yml index b800cb944..a8ecc0c6d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,5 @@ # spell-checker:words POSIX SDK SDKs repo toolchain toolchains -# spell-checker:ignore ABI ARCH BACKTRACE BINDIR COMNTOOLS MINGW MINGWDIR MSVC MSYS USERPROFILE cl dllcrt findstr maint mkdir rustc rustlib rustup targetting uutils vcvarsall +# spell-checker:ignore ABI ARCH BACKTRACE BINDIR COMNTOOLS MINGW MINGWDIR MSVC MSYS USERPROFILE cl dllcrt findstr maint mkdir rustc rustlib rustup uutils vcvarsall version: "{build} ~ {branch}" diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index 4be8d49bc..8b65602cf 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -869,7 +869,7 @@ fn copy_source( /// Read the contents of the directory `root` and recursively copy the /// contents to `target`. /// -/// Any errors encounted copying files in the tree will be logged but +/// Any errors encountered copying files in the tree will be logged but /// will not cause a short-circuit. fn copy_directory(root: &Path, target: &Target, options: &Options) -> CopyResult<()> { if !options.recursive { diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index 365ecd1dc..9883d3040 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -136,7 +136,7 @@ fn parse_opts(args: Vec) -> getopts::Matches { .optflagopt( "g", "group", - "(unimplemented) set group ownership, instead of process'\n \ + "(unimplemented) set group ownership, instead of process's\n \ current group", "GROUP", ) diff --git a/src/uu/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml index 3459a83ee..50872acc6 100644 --- a/src/uu/whoami/Cargo.toml +++ b/src/uu/whoami/Cargo.toml @@ -3,7 +3,7 @@ name = "uu_whoami" version = "0.0.1" authors = [] license = "MIT" -description = "Diplay effective user ID" +description = "Display effective user ID" [lib] path = "src/whoami.rs" diff --git a/tests/test_mktemp.rs b/tests/test_mktemp.rs index f8834b590..3b3b8d34f 100644 --- a/tests/test_mktemp.rs +++ b/tests/test_mktemp.rs @@ -10,9 +10,9 @@ static TEST_TEMPLATE5: &'static str = "tempXXX"; static TEST_TEMPLATE6: &'static str = "tempXXXlate"; static TEST_TEMPLATE7: &'static str = "XXXtemplate"; #[cfg(unix)] -static TEST_TEMPLATE8: &'static str = "tempXXXla/te"; +static TEST_TEMPLATE8: &'static str = "tempXXXl/ate"; #[cfg(windows)] -static TEST_TEMPLATE8: &'static str = "tempXXXla\\te"; +static TEST_TEMPLATE8: &'static str = "tempXXXl\\ate"; const TMPDIR: &'static str = "TMPDIR";