Skip to content

Commit b573df7

Browse files
committed
Auto merge of rust-lang#85458 - jackh726:rollup-zvvybmt, r=jackh726
Rollup of 8 pull requests Successful merges: - rust-lang#83366 (Stabilize extended_key_value_attributes) - rust-lang#83767 (Fix v0 symbol mangling bug) - rust-lang#84883 (compiletest: "fix" FileCheck with --allow-unused-prefixes) - rust-lang#85274 (Only pass --[no-]gc-sections if linker is GNU ld.) - rust-lang#85297 (bootstrap: build cargo only if requested in tools) - rust-lang#85396 (rustdoc: restore header sizes) - rust-lang#85425 (Fix must_use on `Option::is_none`) - rust-lang#85438 (Fix escape handling) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 73c4ce9 + 95abb41 commit b573df7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
#![cfg_attr(bootstrap, feature(doc_spotlight))]
114114
#![cfg_attr(not(bootstrap), feature(doc_notable_trait))]
115115
#![feature(duration_consts_2)]
116-
#![feature(extended_key_value_attributes)]
116+
#![cfg_attr(bootstrap, feature(extended_key_value_attributes))]
117117
#![feature(extern_types)]
118118
#![feature(fundamental)]
119119
#![feature(intra_doc_pointers)]

core/src/option.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl<T> Option<T> {
209209
/// assert_eq!(x.is_none(), true);
210210
/// ```
211211
#[must_use = "if you intended to assert that this doesn't have a value, consider \
212-
`.and_then(|| panic!(\"`Option` had a value when expected `None`\"))` instead"]
212+
`.and_then(|_| panic!(\"`Option` had a value when expected `None`\"))` instead"]
213213
#[inline]
214214
#[rustc_const_stable(feature = "const_option", since = "1.48.0")]
215215
#[stable(feature = "rust1", since = "1.0.0")]

std/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
#![feature(exact_size_is_empty)]
269269
#![feature(exhaustive_patterns)]
270270
#![feature(extend_one)]
271-
#![feature(extended_key_value_attributes)]
271+
#![cfg_attr(bootstrap, feature(extended_key_value_attributes))]
272272
#![feature(fn_traits)]
273273
#![feature(format_args_nl)]
274274
#![feature(gen_future)]

0 commit comments

Comments
 (0)