Skip to content

Commit 41eb230

Browse files
committed
Auto merge of rust-lang#79278 - mark-i-m:stabilize-or-pattern, r=nikomatsakis
Stabilize or_patterns (RFC 2535, 2530, 2175) closes rust-lang#54883 This PR stabilizes the or_patterns feature in Rust 1.53. This is blocked on the following (in order): - [x] The crater run in rust-lang#78935 (comment) - [x] The resolution of the unresolved questions and a second crater run (rust-lang#78935 (comment)) - It looks like we will need to pursue some sort of edition-based transition for `:pat`. - [x] Nomination and discussion by T-lang - [x] Implement new behavior for `:pat` based on consensus (rust-lang#80100). - [ ] An FCP on stabilization EDIT: Stabilization report is in rust-lang#79278 (comment)
2 parents 87bb990 + c5bd872 commit 41eb230

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
@@ -118,7 +118,7 @@
118118
#![feature(nonnull_slice_from_raw_parts)]
119119
#![feature(auto_traits)]
120120
#![feature(option_result_unwrap_unchecked)]
121-
#![feature(or_patterns)]
121+
#![cfg_attr(bootstrap, feature(or_patterns))]
122122
#![feature(pattern)]
123123
#![feature(ptr_internals)]
124124
#![feature(rustc_attrs)]

core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
#![feature(exhaustive_patterns)]
127127
#![feature(no_core)]
128128
#![feature(auto_traits)]
129-
#![feature(or_patterns)]
129+
#![cfg_attr(bootstrap, feature(or_patterns))]
130130
#![feature(prelude_import)]
131131
#![cfg_attr(not(bootstrap), feature(ptr_metadata))]
132132
#![feature(repr_simd, platform_intrinsics)]

std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
#![feature(nonnull_slice_from_raw_parts)]
298298
#![feature(once_cell)]
299299
#![feature(auto_traits)]
300-
#![feature(or_patterns)]
300+
#![cfg_attr(bootstrap, feature(or_patterns))]
301301
#![feature(panic_info_message)]
302302
#![feature(panic_internals)]
303303
#![feature(panic_unwind)]

0 commit comments

Comments
 (0)