Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 003d8d3

Browse files
committedOct 4, 2021
Auto merge of rust-lang#89530 - workingjubilee:rollup-ua14iq6, r=workingjubilee
Rollup of 13 pull requests Successful merges: - rust-lang#83655 ([aarch64] add target feature outline-atomics) - rust-lang#87091 (implement advance_(back_)_by on more iterators) - rust-lang#88451 (Fix an ICE caused by type mismatch errors being ignored) - rust-lang#88452 (VecDeque: improve performance for From<[T; N]>) - rust-lang#89400 (Improve wording of `map_or_else` docs) - rust-lang#89407 (Recommend running `cargo clean` in E0514 output) - rust-lang#89443 (Include the length in BTree hashes) - rust-lang#89444 (rustdoc: use slice::contains instead of open-coding it) - rust-lang#89447 (Improve error message for missing angle brackets in `[_]::method`) - rust-lang#89453 (Consistently use 'supertrait'.) - rust-lang#89483 (Practice diagnostic message convention) - rust-lang#89500 (Fix ICE with buffered lint referring to AST node deleted by everybody_loops) - rust-lang#89508 (Stabilize `const_panic`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 175b8db + 9866b09 commit 003d8d3

File tree

174 files changed

+922
-535
lines changed

Some content is hidden

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

174 files changed

+922
-535
lines changed
 

‎compiler/rustc_save_analysis/src/dump_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ impl<'tcx> DumpVisitor<'tcx> {
682682
);
683683
}
684684

685-
// super-traits
685+
// supertraits
686686
for super_bound in trait_refs.iter() {
687687
let (def_id, sub_span) = match *super_bound {
688688
hir::GenericBound::Trait(ref trait_ref, _) => (

‎compiler/rustc_session/src/session.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
13841384
// Cannot enable crt-static with sanitizers on Linux
13851385
if sess.crt_static(None) && !sess.opts.debugging_opts.sanitizer.is_empty() {
13861386
sess.err(
1387-
"Sanitizer is incompatible with statically linked libc, \
1387+
"sanitizer is incompatible with statically linked libc, \
13881388
disable it using `-C target-feature=-crt-static`",
13891389
);
13901390
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.