Merge branch 'master' into eliza/typos

Cargo.toml

@@ -17,7 +17,7 @@ name = "humility"
 #
 # Be sure to check in and push all of the files that change.  Happy versioning!
 #
-version = "0.11.3"
+version = "0.11.4"
 authors = ["Bryan Cantrill <bryan@oxide.computer>"]
 edition = "2018"
 license = "MPL-2.0"

humility-doppel/src/lib.rs

@@ -318,10 +318,35 @@ impl humility::reflect::Load for TaskId {
 pub struct RingbufEntry {
     pub line: u16,
     pub generation: u16,
-    pub count: u32,
+    pub count: RingbufCount,
     pub payload: Value,
 }
 
+#[derive(Clone, Debug)]
+pub struct RingbufCount(Option<u64>);
+
+impl humility::reflect::Load for RingbufCount {
+    fn from_value(v: &Value) -> Result<Self> {
+        match v.as_base()? {
+            Base::U0 => Ok(Self(None)),
+            Base::U8(v) => Ok(Self(Some(u64::from(*v)))),
+            Base::U16(v) => Ok(Self(Some(u64::from(*v)))),
+            Base::U32(v) => Ok(Self(Some(u64::from(*v)))),
+            Base::U64(v) => Ok(Self(Some(*v))),
+            _ => bail!("not an unsigned integer: {v:?}"),
+        }
+    }
+}
+
+impl std::fmt::Display for RingbufCount {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.0 {
+            Some(v) => v.fmt(f),
+            None => "()".fmt(f),
+        }
+    }
+}
+
 /// Double of the struct from `ringbuf`.
 ///
 /// The Hubris equivalent has a type parameter. We're dynamic instead; see

tests/cmd/chip.trycmd

@@ -13,7 +13,7 @@ For more information try --help
 
 ```
 $ humility --chip this-can-be-anything -V
-humility 0.11.3
+humility 0.11.4
 
 ```
 
@@ -28,7 +28,7 @@ For more information try --help
 
 ```
 $ humility -c apx432 -V
-humility 0.11.3
+humility 0.11.4
 
 ```