mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-06 12:04:36 +00:00
Rollup merge of #89977 - woppopo:result_const_as_mut, r=oli-obk
Make Result::as_mut const Adding `const` for `Result::as_mut`. Tracking issue: #82814
This commit is contained in:
commit
f044a84f5d
@ -729,7 +729,8 @@ impl<T, E> Result<T, E> {
|
|||||||
/// ```
|
/// ```
|
||||||
#[inline]
|
#[inline]
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub fn as_mut(&mut self) -> Result<&mut T, &mut E> {
|
#[rustc_const_unstable(feature = "const_result", issue = "82814")]
|
||||||
|
pub const fn as_mut(&mut self) -> Result<&mut T, &mut E> {
|
||||||
match *self {
|
match *self {
|
||||||
Ok(ref mut x) => Ok(x),
|
Ok(ref mut x) => Ok(x),
|
||||||
Err(ref mut x) => Err(x),
|
Err(ref mut x) => Err(x),
|
||||||
|
@ -65,6 +65,7 @@
|
|||||||
#![feature(once_cell)]
|
#![feature(once_cell)]
|
||||||
#![feature(unsized_tuple_coercion)]
|
#![feature(unsized_tuple_coercion)]
|
||||||
#![feature(const_option)]
|
#![feature(const_option)]
|
||||||
|
#![feature(const_result)]
|
||||||
#![feature(integer_atomics)]
|
#![feature(integer_atomics)]
|
||||||
#![feature(int_roundings)]
|
#![feature(int_roundings)]
|
||||||
#![feature(slice_group_by)]
|
#![feature(slice_group_by)]
|
||||||
|
@ -352,6 +352,29 @@ fn result_const() {
|
|||||||
assert!(!IS_ERR)
|
assert!(!IS_ERR)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
const fn result_const_mut() {
|
||||||
|
let mut result: Result<usize, bool> = Ok(32);
|
||||||
|
|
||||||
|
{
|
||||||
|
let as_mut = result.as_mut();
|
||||||
|
match as_mut {
|
||||||
|
Ok(v) => *v = 42,
|
||||||
|
Err(_) => unreachable!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut result_err: Result<usize, bool> = Err(false);
|
||||||
|
|
||||||
|
{
|
||||||
|
let as_mut = result_err.as_mut();
|
||||||
|
match as_mut {
|
||||||
|
Ok(_) => unreachable!(),
|
||||||
|
Err(v) => *v = true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn result_opt_conversions() {
|
fn result_opt_conversions() {
|
||||||
#[derive(Copy, Clone, Debug, PartialEq)]
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
||||||
|
Loading…
Reference in New Issue
Block a user