From c453f2eb0cdcf598ad2fb666ff4770af3a6a6b8e Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Sat, 29 Oct 2022 13:07:37 +0200
Subject: [PATCH] Optimizations

---
 .../rust/preserves/src/value/packed/constants.rs          | 2 ++
 implementations/rust/preserves/src/value/repr.rs          | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/implementations/rust/preserves/src/value/packed/constants.rs b/implementations/rust/preserves/src/value/packed/constants.rs
index 90feaed..6e001e0 100644
--- a/implementations/rust/preserves/src/value/packed/constants.rs
+++ b/implementations/rust/preserves/src/value/packed/constants.rs
@@ -39,6 +39,7 @@ impl From<InvalidTag> for crate::error::Error {
 
 impl TryFrom<u8> for Tag {
     type Error = InvalidTag;
+    #[inline(always)]
     fn try_from(v: u8) -> Result<Self, Self::Error> {
         match v {
             0x80 => Ok(Self::False),
@@ -65,6 +66,7 @@ impl TryFrom<u8> for Tag {
 }
 
 impl From<Tag> for u8 {
+    #[inline(always)]
     fn from(v: Tag) -> Self {
         match v {
             Tag::False => 0x80,
diff --git a/implementations/rust/preserves/src/value/repr.rs b/implementations/rust/preserves/src/value/repr.rs
index a86b1da..67d1948 100644
--- a/implementations/rust/preserves/src/value/repr.rs
+++ b/implementations/rust/preserves/src/value/repr.rs
@@ -1234,7 +1234,7 @@ impl<D: Domain> NestedValue for PlainValue<D> {
 
     #[inline(always)]
     fn annotations(&self) -> Option<&Annotations<Self>> {
-        self.0.0.as_ref()
+        if let Some(b) = &self.0.0 { Some(b) } else { None }
     }
 
     #[inline(always)]
@@ -1284,7 +1284,7 @@ impl<D: Domain> NestedValue for RcValue<D> {
 
     #[inline(always)]
     fn annotations(&self) -> Option<&Annotations<Self>> {
-        self.0.0.as_ref()
+        if let Some(b) = &self.0.0 { Some(b) } else { None }
     }
 
     #[inline(always)]
@@ -1334,7 +1334,7 @@ impl<D: Domain> NestedValue for ArcValue<D> {
 
     #[inline(always)]
     fn annotations(&self) -> Option<&Annotations<Self>> {
-        self.0.0.as_ref()
+        if let Some(b) = &self.0.0 { Some(b) } else { None }
     }
 
     #[inline(always)]
@@ -1388,7 +1388,7 @@ impl NestedValue for IOValue {
 
     #[inline(always)]
     fn annotations(&self) -> Option<&Annotations<Self>> {
-        self.0.0.as_ref()
+        if let Some(b) = &self.0.0 { Some(b) } else { None }
     }
 
     #[inline(always)]