diff --git a/README.md b/README.md index 6e5bd6a1d..cf5cd660f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ sccache includes support for caching the compilation of C/C++ code, [Rust](docs/ sccache also provides [icecream](https://github.com/icecc/icecream)-style distributed compilation (automatic packaging of local toolchains) for all supported compilers (including Rust). The distributed compilation system includes several security features that icecream lacks such as authentication, transport layer encryption, and sandboxed compiler execution on build servers. See [the distributed quickstart](docs/DistributedQuickstart.md) guide for more information. -sccache is also available as a [GitHub Actions](https://github.com/marketplace/actions/sccache-action) to faciliate the deployment using GitHub Actions cache. +sccache is also available as a [GitHub Actions](https://github.com/marketplace/actions/sccache-action) to facilitate the deployment using GitHub Actions cache. --- diff --git a/docs/ResponseFiles.md b/docs/ResponseFiles.md index 9c0ccd027..bb20a62bf 100644 --- a/docs/ResponseFiles.md +++ b/docs/ResponseFiles.md @@ -27,10 +27,10 @@ Per the [MSVC docs](https://learn.microsoft.com/en-us/cpp/build/reference/cl-com 4. The `/link` directive has special treatment: 1. Entering an @file: if the `/link` option is provided prior to an `@file` in the command line, the `/link` directive does not affect any options within the `@file`. 2. Newlines: A `/link` directive provided in an `@file` on one line does not affect the next line. - 3. Exitting an @file: A `/link` directive on the final line of a response file does not affect options following the `@file` option in the command line. + 3. Exiting an @file: A `/link` directive on the final line of a response file does not affect options following the `@file` option in the command line. 5. A response file cannot contain additional `@file` options, they are not recursive. (found in a [separate doc](https://learn.microsoft.com/en-us/cpp/build/reference/at-specify-a-compiler-response-file?view=msvc-170)) 6. (implied) options can be wrapped in double-quotes (`"`), which allows whitespace to be preserved within the option -The msvc implementaion in sccache supports all of these **except** #4, because sccache doesn't accept the `/link` directive. +The msvc implementation in sccache supports all of these **except** #4, because sccache doesn't accept the `/link` directive. Additionally, because `msbuild` generates response files using an encoding other than `utf-8`, all text files under the [WHATWG encoding standard](https://encoding.spec.whatwg.org/) are supported. This includes both `utf-8` and `utf-16`. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 796e2a47e..881738fef 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -18,7 +18,7 @@ description: | sandboxed compiler execution on build servers. See the distributed quickstart guide for more information. - sccache is also available as a GitHub Actions to faciliate the deployment + sccache is also available as a GitHub Actions to facilitate the deployment using GitHub Actions cache. website: https://github.com/mozilla/sccache contact: https://github.com/mozilla/sccache/issues diff --git a/src/compiler/msvc.rs b/src/compiler/msvc.rs index 248c9e195..c1dbcee22 100644 --- a/src/compiler/msvc.rs +++ b/src/compiler/msvc.rs @@ -1131,7 +1131,7 @@ impl<'a> Iterator for ExpandIncludeFile<'a> { loop { // Visit all arguments found in the most recently read response file. // Since response files are not recursive, we do not need to worry - // about these containing addditional @ directives. + // about these containing additional @ directives. if let Some(response_file_arg) = self.stack.pop() { return Some(response_file_arg); } @@ -1151,7 +1151,7 @@ impl<'a> Iterator for ExpandIncludeFile<'a> { Ok(content) => content, Err(err) => { debug!("failed to read @-file `{}`: {}", file_path.display(), err); - // If we failed to read the file content, return the orginal arg (including the `@` directive). + // If we failed to read the file content, return the original arg (including the `@` directive). return Some(arg); } }; diff --git a/src/compiler/nvhpc.rs b/src/compiler/nvhpc.rs index e86ce782e..a09eb6cac 100644 --- a/src/compiler/nvhpc.rs +++ b/src/compiler/nvhpc.rs @@ -132,7 +132,7 @@ impl CCompilerImpl for Nvhpc { trace!("preprocess"); let mut cmd = initialize_cmd_and_args(); - //NVHPC doesn't support disabling line info when outputing to console + //NVHPC doesn't support disabling line info when outputting to console cmd.arg("-E") .env_clear() .envs(env_vars.iter().map(|(k, v)| (k, v))) diff --git a/src/config.rs b/src/config.rs index 1e7bca567..07dee8b3f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -603,7 +603,7 @@ fn config_from_env() -> Result { if env::var("SCCACHE_GCS_OAUTH_URL").is_ok() { eprintln!("SCCACHE_GCS_OAUTH_URL has been deprecated"); - eprintln!("if you intend to use vm metadata for auth, please set correct service account intead"); + eprintln!("if you intend to use vm metadata for auth, please set correct service account instead"); } let credential_url = env::var("SCCACHE_GCS_CREDENTIALS_URL").ok(); diff --git a/tests/system.rs b/tests/system.rs index 8feab0fa6..c7716de25 100644 --- a/tests/system.rs +++ b/tests/system.rs @@ -583,7 +583,7 @@ fn test_cuda_compiles(compiler: &Compiler, tempdir: &Path) { assert_eq!(&1, info.stats.cache_misses.get_adv(&adv_cuda_key).unwrap()); }); // By compiling another input source we verify that the pre-processor - // phase is correctly running and outputing text + // phase is correctly running and outputting text trace!("compile B"); sccache_command() .args(&compile_cuda_cmdline(