Skip to content

Commit 73b4699

Browse files
RandlRandl
committed
change feature gate
1 parent b56098f commit 73b4699

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎library/core/src/result.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ impl<T, E> Result<T, E> {
607607
#[must_use]
608608
#[inline]
609609
#[stable(feature = "is_some_and", since = "1.70.0")]
610-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
610+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
611611
pub const fn is_ok_and<F>(self, f: F) -> bool
612612
where
613613
F: ~const FnOnce(T) -> bool + ~const Destruct,
@@ -662,7 +662,7 @@ impl<T, E> Result<T, E> {
662662
#[must_use]
663663
#[inline]
664664
#[stable(feature = "is_some_and", since = "1.70.0")]
665-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
665+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
666666
pub const fn is_err_and<F>(self, f: F) -> bool
667667
where
668668
F: ~const FnOnce(E) -> bool + ~const Destruct,
@@ -695,7 +695,7 @@ impl<T, E> Result<T, E> {
695695
/// ```
696696
#[inline]
697697
#[stable(feature = "rust1", since = "1.0.0")]
698-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
698+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
699699
#[rustc_diagnostic_item = "result_ok_method"]
700700
pub const fn ok(self) -> Option<T>
701701
where
@@ -724,7 +724,7 @@ impl<T, E> Result<T, E> {
724724
/// ```
725725
#[inline]
726726
#[stable(feature = "rust1", since = "1.0.0")]
727-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
727+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
728728
pub const fn err(self) -> Option<E>
729729
where
730730
T: ~const Destruct,
@@ -819,7 +819,7 @@ impl<T, E> Result<T, E> {
819819
/// ```
820820
#[inline]
821821
#[stable(feature = "rust1", since = "1.0.0")]
822-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
822+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
823823
pub const fn map<U, F>(self, op: F) -> Result<U, E>
824824
where
825825
F: ~const FnOnce(T) -> U + ~const Destruct,
@@ -850,7 +850,7 @@ impl<T, E> Result<T, E> {
850850
/// ```
851851
#[inline]
852852
#[stable(feature = "result_map_or", since = "1.41.0")]
853-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
853+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
854854
#[must_use = "if you don't need the returned value, use `if let` instead"]
855855
pub const fn map_or<U, F>(self, default: U, f: F) -> U
856856
where
@@ -885,7 +885,7 @@ impl<T, E> Result<T, E> {
885885
/// ```
886886
#[inline]
887887
#[stable(feature = "result_map_or_else", since = "1.41.0")]
888-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
888+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
889889
pub const fn map_or_else<U, D, F>(self, default: D, f: F) -> U
890890
where
891891
D: ~const FnOnce(E) -> U + ~const Destruct,
@@ -916,7 +916,7 @@ impl<T, E> Result<T, E> {
916916
/// [default value]: Default::default
917917
#[inline]
918918
#[unstable(feature = "result_option_map_or_default", issue = "138099")]
919-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
919+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
920920
pub const fn map_or_default<U, F>(self, f: F) -> U
921921
where
922922
F: ~const FnOnce(T) -> U + ~const Destruct,
@@ -950,7 +950,7 @@ impl<T, E> Result<T, E> {
950950
/// ```
951951
#[inline]
952952
#[stable(feature = "rust1", since = "1.0.0")]
953-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
953+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
954954
pub const fn map_err<F, O>(self, op: O) -> Result<T, F>
955955
where
956956
O: ~const FnOnce(E) -> F + ~const Destruct,
@@ -976,7 +976,7 @@ impl<T, E> Result<T, E> {
976976
/// ```
977977
#[inline]
978978
#[stable(feature = "result_option_inspect", since = "1.76.0")]
979-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
979+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
980980
pub const fn inspect<F>(self, f: F) -> Self
981981
where
982982
F: ~const FnOnce(&T) + ~const Destruct,
@@ -1004,7 +1004,7 @@ impl<T, E> Result<T, E> {
10041004
/// ```
10051005
#[inline]
10061006
#[stable(feature = "result_option_inspect", since = "1.76.0")]
1007-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1007+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
10081008
pub const fn inspect_err<F>(self, f: F) -> Self
10091009
where
10101010
F: ~const FnOnce(&E) + ~const Destruct,
@@ -1087,7 +1087,7 @@ impl<T, E> Result<T, E> {
10871087
/// ```
10881088
#[inline]
10891089
#[stable(feature = "rust1", since = "1.0.0")]
1090-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1090+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
10911091
pub const fn iter(&self) -> Iter<'_, T> {
10921092
Iter { inner: self.as_ref().ok() }
10931093
}
@@ -1111,7 +1111,7 @@ impl<T, E> Result<T, E> {
11111111
/// ```
11121112
#[inline]
11131113
#[stable(feature = "rust1", since = "1.0.0")]
1114-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1114+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
11151115
pub const fn iter_mut(&mut self) -> IterMut<'_, T> {
11161116
IterMut { inner: self.as_mut().ok() }
11171117
}
@@ -1251,7 +1251,7 @@ impl<T, E> Result<T, E> {
12511251
/// [`FromStr`]: crate::str::FromStr
12521252
#[inline]
12531253
#[stable(feature = "result_unwrap_or_default", since = "1.16.0")]
1254-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1254+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
12551255
pub const fn unwrap_or_default(self) -> T
12561256
where
12571257
T: ~const Default + ~const Destruct,
@@ -1424,7 +1424,7 @@ impl<T, E> Result<T, E> {
14241424
/// ```
14251425
#[inline]
14261426
#[stable(feature = "rust1", since = "1.0.0")]
1427-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1427+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
14281428
pub const fn and<U>(self, res: Result<U, E>) -> Result<U, E>
14291429
where
14301430
T: ~const Destruct,
@@ -1469,7 +1469,7 @@ impl<T, E> Result<T, E> {
14691469
/// ```
14701470
#[inline]
14711471
#[stable(feature = "rust1", since = "1.0.0")]
1472-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1472+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
14731473
#[rustc_confusables("flat_map", "flatmap")]
14741474
pub const fn and_then<U, F>(self, op: F) -> Result<U, E>
14751475
where
@@ -1510,7 +1510,7 @@ impl<T, E> Result<T, E> {
15101510
/// ```
15111511
#[inline]
15121512
#[stable(feature = "rust1", since = "1.0.0")]
1513-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1513+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
15141514
pub const fn or<F>(self, res: Result<T, F>) -> Result<T, F>
15151515
where
15161516
T: ~const Destruct,
@@ -1541,7 +1541,7 @@ impl<T, E> Result<T, E> {
15411541
/// ```
15421542
#[inline]
15431543
#[stable(feature = "rust1", since = "1.0.0")]
1544-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1544+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
15451545
pub const fn or_else<F, O>(self, op: O) -> Result<T, F>
15461546
where
15471547
O: ~const FnOnce(E) -> Result<T, F> + ~const Destruct,
@@ -1572,7 +1572,7 @@ impl<T, E> Result<T, E> {
15721572
/// ```
15731573
#[inline]
15741574
#[stable(feature = "rust1", since = "1.0.0")]
1575-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1575+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
15761576
pub const fn unwrap_or(self, default: T) -> T
15771577
where
15781578
T: ~const Destruct,
@@ -1598,7 +1598,7 @@ impl<T, E> Result<T, E> {
15981598
#[inline]
15991599
#[track_caller]
16001600
#[stable(feature = "rust1", since = "1.0.0")]
1601-
#[rustc_const_unstable(feature = "const_result_callback_methods", issue = "67792")]
1601+
#[rustc_const_unstable(feature = "const_result_trait_fn", issue = "67792")]
16021602
pub const fn unwrap_or_else<F>(self, op: F) -> T
16031603
where
16041604
F: ~const FnOnce(E) -> T + ~const Destruct,

‎library/coretests/tests/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#![feature(const_eval_select)]
2222
#![feature(const_float_round_methods)]
2323
#![feature(const_ref_cell)]
24-
#![feature(const_result_callback_methods)]
24+
#![feature(const_result_trait_fn)]
2525
#![feature(const_trait_impl)]
2626
#![feature(core_float_math)]
2727
#![feature(core_intrinsics)]

0 commit comments

Comments
 (0)