Skip to content

Commit 0335fbf

Browse files
committed
Auto merge of #101938 - Dylan-DPC:rollup-6vlohhs, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #93628 (Stabilize `let else`) - #98441 (Implement simd_as for pointers) - #101790 (Do not suggest a placeholder to const and static without a type) - #101807 (Disallow defaults on type GATs) - #101915 (doc: fix redirected link in `/index.html`) - #101931 (doc: Fix a typo in `Rc::make_mut` docstring) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 28747f6 + b64f69f commit 0335fbf

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

alloc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
#![cfg_attr(not(test), feature(generator_trait))]
170170
#![feature(hashmap_internals)]
171171
#![feature(lang_items)]
172-
#![feature(let_else)]
172+
#![cfg_attr(bootstrap, feature(let_else))]
173173
#![feature(min_specialization)]
174174
#![feature(negative_impls)]
175175
#![feature(never_type)]

alloc/src/rc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ impl<T: Clone> Rc<T> {
11421142
/// be cloned.
11431143
///
11441144
/// See also [`get_mut`], which will fail rather than cloning the inner value
1145-
/// or diassociating [`Weak`] pointers.
1145+
/// or disassociating [`Weak`] pointers.
11461146
///
11471147
/// [`clone`]: Clone::clone
11481148
/// [`get_mut`]: Rc::get_mut

std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
#![cfg_attr(bootstrap, feature(label_break_value))]
256256
#![feature(lang_items)]
257257
#![feature(let_chains)]
258-
#![feature(let_else)]
258+
#![cfg_attr(bootstrap, feature(let_else))]
259259
#![feature(linkage)]
260260
#![feature(link_cfg)]
261261
#![feature(min_specialization)]

0 commit comments

Comments
 (0)