Skip to content

Commit

Permalink
Merge pull request #5 from PLSysSec/nico/do-not-type-aliases-as-sorts
Browse files Browse the repository at this point in the history
Do not use type aliases as sorts
  • Loading branch information
nilehmann authored Nov 9, 2024
2 parents bf2b7e8 + 1330853 commit d51e2b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions flux_support/src/flux_ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/process_standard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d51e2b1

Please sign in to comment.