mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Less magic number for corountine

Browse Source
This commit is contained in:
Liu Dingming 2024-07-04 04:41:37 +08:00
parent 2db4ff40af
commit 4930937960
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_middle/src/ty/sty.rs
View File

@ -68,6 +68,10 @@ impl<'tcx> ty::CoroutineArgs<TyCtxt<'tcx>> {
const RETURNED: usize = 1; const RETURNED: usize = 1;
/// Coroutine has been poisoned. /// Coroutine has been poisoned.
const POISONED: usize = 2; const POISONED: usize = 2;
/// Number of variants to reserve in coroutine state. Corresponds to
/// `UNRESUMED` (beginning of a coroutine) and `RETURNED`/`POISONED`
/// (end of a coroutine) states.
const RESERVED_VARIANTS: usize = 3;
const UNRESUMED_NAME: &'static str = "Unresumed"; const UNRESUMED_NAME: &'static str = "Unresumed";
const RETURNED_NAME: &'static str = "Returned"; const RETURNED_NAME: &'static str = "Returned";
@ -116,7 +120,7 @@ fn variant_name(v: VariantIdx) -> Cow<'static, str> {
Self::UNRESUMED => Cow::from(Self::UNRESUMED_NAME), Self::UNRESUMED => Cow::from(Self::UNRESUMED_NAME),
Self::RETURNED => Cow::from(Self::RETURNED_NAME), Self::RETURNED => Cow::from(Self::RETURNED_NAME),
Self::POISONED => Cow::from(Self::POISONED_NAME), Self::POISONED => Cow::from(Self::POISONED_NAME),
_ => Cow::from(format!("Suspend{}", v.as_usize() - 3)), _ => Cow::from(format!("Suspend{}", v.as_usize() - Self::RESERVED_VARIANTS)),
} }
} }

7
compiler/rustc_mir_transform/src/coroutine.rs
View File

@ -208,11 +208,8 @@ fn replace_base<'tcx>(place: &mut Place<'tcx>, new_base: Place<'tcx>, tcx: TyCtx
const RETURNED: usize = CoroutineArgs::RETURNED; const RETURNED: usize = CoroutineArgs::RETURNED;
/// Coroutine has panicked and is poisoned. /// Coroutine has panicked and is poisoned.
const POISONED: usize = CoroutineArgs::POISONED; const POISONED: usize = CoroutineArgs::POISONED;
/// Number of reserved variants of coroutine state.
/// Number of variants to reserve in coroutine state. Corresponds to const RESERVED_VARIANTS: usize = CoroutineArgs::RESERVED_VARIANTS;
/// `UNRESUMED` (beginning of a coroutine) and `RETURNED`/`POISONED`
/// (end of a coroutine) states.
const RESERVED_VARIANTS: usize = 3;
/// A `yield` point in the coroutine. /// A `yield` point in the coroutine.
struct SuspensionPoint<'tcx> { struct SuspensionPoint<'tcx> {