diff options
| author | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
| commit | f943349eafaa75a60c05b0c84dcdb771d0eae8c9 (patch) | |
| tree | 9e2d6e08dc1aff13d98144034e7db7080e6eb872 /src/librustc_codegen_utils | |
| parent | 823ff8cf1397a5772b1f6954b60576202bf91836 (diff) | |
| parent | 8ee7278fca2cb137c81c8a12ca46c5df1838c2f3 (diff) | |
Auto merge of #69804 - Centril:rollup-u86dc1g, r=Centril
Rollup of 8 pull requests Successful merges: - #69667 (Remove the `no_debug` feature) - #69687 (resolve, inconsistent binding mode: tweak wording) - #69708 (On mismatched delimiters, only point at empty blocks that are in the same line) - #69765 (reduce test size for Miri) - #69773 (fix various typos) - #69787 (mir::Local is Copy we can pass it by value in these cases) - #69794 (Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`) - #69797 (Correct version that relaxed orphan rules) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/symbol_names.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs index 6713459f627..cfde09fad62 100644 --- a/src/librustc_codegen_utils/symbol_names.rs +++ b/src/librustc_codegen_utils/symbol_names.rs @@ -185,7 +185,7 @@ fn compute_symbol_name( // // * On the wasm32 targets there is a bug (or feature) in LLD [1] where the // same-named symbol when imported from different wasm modules will get - // hooked up incorectly. As a result foreign symbols, on the wasm target, + // hooked up incorrectly. As a result foreign symbols, on the wasm target, // with a wasm import module, get mangled. Additionally our codegen will // deduplicate symbols based purely on the symbol name, but for wasm this // isn't quite right because the same-named symbol on wasm can come from |