Skip to content

Commit f943349

Browse files
committedMar 8, 2020
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
2 parents 823ff8c + 8ee7278 commit f943349

File tree

153 files changed

+286
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+286
-382
lines changed
 

‎config.toml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
# `0` - no debug info
316316
# `1` - line tables only
317317
# `2` - full debug info with variable and type information
318-
# Can be overriden for specific subsets of Rust code (rustc, std or tools).
318+
# Can be overridden for specific subsets of Rust code (rustc, std or tools).
319319
# Debuginfo for tests run with compiletest is not controlled by this option
320320
# and needs to be enabled separately with `debuginfo-level-tests`.
321321
#debuginfo-level = if debug { 2 } else { 0 }

‎src/bootstrap/compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn copy_third_party_objects(
141141
copy_and_stamp(&srcdir, "crt1.o");
142142
}
143143

144-
// Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
144+
// Copies libunwind.a compiled to be linked with x86_64-fortanix-unknown-sgx.
145145
//
146146
// This target needs to be linked to Fortanix's port of llvm's libunwind.
147147
// libunwind requires support for rwlock and printing to stderr,

0 commit comments

Comments
 (0)
Please sign in to comment.