nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #122424 - testwill:typos, r=michaelwoerister

Browse Source 
fix: typos
This commit is contained in:
Matthias Krüger 2024-03-13 20:01:54 +01:00 committed by GitHub
commit ff5e1eb8ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_target/src/spec/mod.rs
View File

@ -211,7 +211,7 @@ impl ToJson for LldFlavor {
impl LinkerFlavor { impl LinkerFlavor {
/// At this point the target's reference linker flavor doesn't yet exist and we need to infer /// At this point the target's reference linker flavor doesn't yet exist and we need to infer
/// it. The inference always succeds and gives some result, and we don't report any flavor /// it. The inference always succeeds and gives some result, and we don't report any flavor
/// incompatibility errors for json target specs. The CLI flavor is used as the main source /// incompatibility errors for json target specs. The CLI flavor is used as the main source
/// of truth, other flags are used in case of ambiguities. /// of truth, other flags are used in case of ambiguities.
fn from_cli_json(cli: LinkerFlavorCli, lld_flavor: LldFlavor, is_gnu: bool) -> LinkerFlavor { fn from_cli_json(cli: LinkerFlavorCli, lld_flavor: LldFlavor, is_gnu: bool) -> LinkerFlavor {
@ -581,7 +581,7 @@ impl LinkSelfContainedDefault {
self == LinkSelfContainedDefault::False self == LinkSelfContainedDefault::False
} }
/// Returns whether the target spec explictly requests self-contained linking, i.e. not via /// Returns whether the target spec explicitly requests self-contained linking, i.e. not via
/// inference. /// inference.
pub fn is_linker_enabled(self) -> bool { pub fn is_linker_enabled(self) -> bool {
match self { match self {
@ -2090,7 +2090,7 @@ pub struct TargetOptions {
/// If `None`, then `CFG_DEFAULT_CODEGEN_BACKEND` environmental variable captured when /// If `None`, then `CFG_DEFAULT_CODEGEN_BACKEND` environmental variable captured when
/// compiling `rustc` will be used instead (or llvm if it is not set). /// compiling `rustc` will be used instead (or llvm if it is not set).
/// ///
/// N.B. when *using* the compiler, backend can always be overriden with `-Zcodegen-backend`. /// N.B. when *using* the compiler, backend can always be overridden with `-Zcodegen-backend`.
pub default_codegen_backend: Option<StaticCow<str>>, pub default_codegen_backend: Option<StaticCow<str>>,
/// Whether to generate trap instructions in places where optimization would /// Whether to generate trap instructions in places where optimization would