diff options
| author | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
| commit | 2a280de64fb34378174fa33b6866a7ee920ceb8d (patch) | |
| tree | 9399eae34b3e1e5526e28c18d78d10b37afdb221 /compiler/rustc_codegen_ssa/src | |
| parent | 39a3b527674c1c8d2b9d3edc0cfae67abe6b3ecb (diff) | |
| parent | e89ab08f11332f11d8b574b43f11b9d7b3c18346 (diff) | |
| download | rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.tar.gz rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.zip | |
Auto merge of #94514 - matthiaskrgr:rollup-pdzn82h, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #94464 (Suggest adding a new lifetime parameter when two elided lifetimes should match up for traits and impls.) - #94476 (7 - Make more use of `let_chains`) - #94478 (Fix panic when handling intra doc links generated from macro) - #94482 (compiler: fix some typos) - #94490 (Update books) - #94496 (tests: accept llvm intrinsic in align-checking test) - #94498 (9 - Make more use of `let_chains`) - #94503 (Provide C FFI types via core::ffi, not just in std) - #94513 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 587453fd8e8..b36645ad37b 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -989,7 +989,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( // ... and otherwise we're processing a `*.dwp` packed dwarf file. // - // We cannot rely on the .o paths in the exectuable because they may have been + // We cannot rely on the .o paths in the executable because they may have been // remapped by --remap-path-prefix and therefore invalid, so we need to provide // the .o/.dwo paths explicitly. SplitDebuginfo::Packed => link_dwarf_object(sess, codegen_results, out_filename), diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index 3fb56f42b8c..a838787381d 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -1338,7 +1338,7 @@ impl<'a> Linker for WasmLd<'a> { } // LLD will hide these otherwise-internal symbols since it only exports - // symbols explicity passed via the `--export` flags above and hides all + // symbols explicitly passed via the `--export` flags above and hides all // others. Various bits and pieces of tooling use this, so be sure these // symbols make their way out of the linker as well. self.cmd.arg("--export=__heap_base"); |