From 13308536984a281c7464a49c6af0722e0265c646 Mon Sep 17 00:00:00 2001 From: Nico Lehmann Date: Sat, 9 Nov 2024 00:23:01 -0800 Subject: [PATCH] Do not type aliases as sorts --- flux_support/src/flux_ptr.rs | 3 +-- kernel/src/process_standard.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flux_support/src/flux_ptr.rs b/flux_support/src/flux_ptr.rs index 758b5223a1..c6b7bedeb1 100644 --- a/flux_support/src/flux_ptr.rs +++ b/flux_support/src/flux_ptr.rs @@ -159,9 +159,8 @@ impl PartialOrd for FluxPtr { } } -#[flux_rs::alias(type FluxPtrU8[n: int] = FluxPtr[n])] pub type FluxPtrU8 = FluxPtr; -#[flux_rs::alias(type FluxPtrU8Mut[n: int] = FluxPtr[n])] + pub type FluxPtrU8Mut = FluxPtr; pub trait FluxPtrExt { diff --git a/kernel/src/process_standard.rs b/kernel/src/process_standard.rs index 2ef2497a66..dff890a5e6 100644 --- a/kernel/src/process_standard.rs +++ b/kernel/src/process_standard.rs @@ -123,7 +123,7 @@ struct ProcessBreaks { } /// A type for userspace processes in Tock. -#[flux_rs::refined_by(mem_start: FluxPtrU8Mut, mem_len: int)] +#[flux_rs::refined_by(mem_start: FluxPtr, mem_len: int)] #[flux_rs::invariant(mem_start + mem_len <= usize::MAX)] // mem doesn't overflow address space pub struct ProcessStandard<'a, C: 'static + Chip> { /// Identifier of this process and the index of the process in the process