diff options
| author | bors <bors@rust-lang.org> | 2022-03-03 21:40:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-03 21:40:28 +0000 |
| commit | 40d3040ae19b8c43c0027bc6d3e9805e5ee5e0ee (patch) | |
| tree | 69fdb6d043602269c8cfb2a9c51984d5039b4ed6 /compiler/rustc_codegen_llvm/src | |
| parent | 10913c00018c76103b2fd4260d8c02ec728fd244 (diff) | |
| parent | cfa58dfd1c78ec170a1b13ae1d31ce99310bdce8 (diff) | |
| download | rust-40d3040ae19b8c43c0027bc6d3e9805e5ee5e0ee.tar.gz rust-40d3040ae19b8c43c0027bc6d3e9805e5ee5e0ee.zip | |
Auto merge of #94571 - matthiaskrgr:rollup-4ul5ydb, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #92697 (Use cgroup quotas for calculating `available_parallelism`) - #94057 (improve comments for `simplify_type`) - #94547 (`parse_tt` cleanups) - #94550 (rustdoc: Add test for higher kinded functions generated by macros) - #94551 (Doc: Fix use of quote instead of backstick in Adapter::map.) - #94554 (Fix invalid lint_node_id being put on a removed stmt) - #94555 (all: fix some typos) - #94563 (Remove a unnecessary `..` pattern) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 3b06587061d..e9d13a4ebaf 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -369,12 +369,12 @@ pub fn target_cpu(sess: &Session) -> &str { /// The list of LLVM features computed from CLI flags (`-Ctarget-cpu`, `-Ctarget-feature`, /// `--target` and similar). pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<String> { - // Features that come earlier are overriden by conflicting features later in the string. + // Features that come earlier are overridden by conflicting features later in the string. // Typically we'll want more explicit settings to override the implicit ones, so: // - // * Features from -Ctarget-cpu=*; are overriden by [^1] - // * Features implied by --target; are overriden by - // * Features from -Ctarget-feature; are overriden by + // * Features from -Ctarget-cpu=*; are overridden by [^1] + // * Features implied by --target; are overridden by + // * Features from -Ctarget-feature; are overridden by // * function specific features. // // [^1]: target-cpu=native is handled here, other target-cpu values are handled implicitly @@ -383,7 +383,7 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str // FIXME(nagisa): it isn't clear what's the best interaction between features implied by // `-Ctarget-cpu` and `--target` are. On one hand, you'd expect CLI arguments to always // override anything that's implicit, so e.g. when there's no `--target` flag, features implied - // the host target are overriden by `-Ctarget-cpu=*`. On the other hand, what about when both + // the host target are overridden by `-Ctarget-cpu=*`. On the other hand, what about when both // `--target` and `-Ctarget-cpu=*` are specified? Both then imply some target features and both // flags are specified by the user on the CLI. It isn't as clear-cut which order of precedence // should be taken in cases like these. |