Skip to content

Commit dab3a80

Browse files
committedFeb 4, 2021
Auto merge of #81761 - m-ou-se:rollup-xp7v07n, r=m-ou-se
Rollup of 9 pull requests Successful merges: - #74304 (Stabilize the Wake trait) - #79805 (Rename Iterator::fold_first to reduce and stabilize it) - #81556 (introduce future-compatibility warning for forbidden lint groups) - #81645 (Add lint for `panic!(123)` which is not accepted in Rust 2021.) - #81710 (OsStr eq_ignore_ascii_case takes arg by value) - #81711 (add #[inline] to all the public IpAddr functions) - #81725 (Move test to be with the others) - #81727 (Revert stabilizing integer::BITS.) - #81745 (Stabilize poison API of Once, rename poisoned()) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.88.01.51.0
2 parents 4f4656d + 6f014cd commit dab3a80

File tree

72 files changed

+1122
-355
lines changed

Some content is hidden

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

72 files changed

+1122
-355
lines changed
 

‎compiler/rustc_ast/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(const_fn_transmute)]
1515
#![feature(const_panic)]
1616
#![feature(crate_visibility_modifier)]
17-
#![feature(iterator_fold_self)]
1817
#![feature(label_break_value)]
1918
#![feature(nll)]
2019
#![feature(or_patterns)]

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub trait ExpectOne<A: Array> {
2828

2929
impl<A: Array> ExpectOne<A> for SmallVec<A> {
3030
fn expect_one(self, err: &'static str) -> A::Item {
31-
assert!(self.len() == 1, err);
31+
assert!(self.len() == 1, "{}", err);
3232
self.into_iter().next().unwrap()
3333
}
3434
}

0 commit comments

Comments
 (0)
Please sign in to comment.