From 8e7e652a7687426f661e7e53ad145c03f637a0f5 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Thu, 3 Dec 2020 02:31:30 +0200 Subject: [PATCH] [sq] rename derivation_node --- nucleus/src/arch/aarch64/caps.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nucleus/src/arch/aarch64/caps.rs b/nucleus/src/arch/aarch64/caps.rs index bc9d8e4..0f29a06 100644 --- a/nucleus/src/arch/aarch64/caps.rs +++ b/nucleus/src/arch/aarch64/caps.rs @@ -457,7 +457,7 @@ impl CapNodeCapability { (1usize << self.0.read(CapNodeCap::Radix)) * core::mem::size_of::(); let slice = unsafe { core::slice::from_raw_parts_mut(ptr as *mut CapTableEntry, size) }; slice[slot].capability = cap.as_u128(); - slice[slot].derivation_node = DerivationTreeNode::empty() + slice[slot].derivation = DerivationTreeNode::empty() .set_revocable(true) .set_first_badged(true); } @@ -562,7 +562,7 @@ pub enum CapError { #[derive(Clone)] pub struct CapTableEntry { capability: u128, - derivation_node: DerivationTreeNode, + derivation: DerivationTreeNode, } impl fmt::Debug for CapTableEntry { @@ -582,7 +582,7 @@ impl CapTableEntry { fn empty() -> CapTableEntry { CapTableEntry { capability: 0, - derivation_node: DerivationTreeNode::empty(), + derivation: DerivationTreeNode::empty(), } } } @@ -681,7 +681,7 @@ mod tests { fn first_capability_derivation_has_no_prev_link() { let entry = CapTableEntry::empty(); assert!(entry - .derivation_node + .derivation .try_get_prev() .contains_err(&DerivationTreeError::InvalidPrev)); }