Merge branch 'master' into rebootleby

cmd/readvar/src/lib.rs

@@ -135,14 +135,19 @@ fn readvar(context: &mut ExecutionContext) -> Result<()> {
         n == v || n.ends_with(&suffix)
     }
 
-    if let Some(ref variable) = subargs.variable {
+    if let Some(variable) = &subargs.variable {
         let m =
             if variable.contains("::") { match_exact } else { match_suffix };
 
+        let mut found = false;
         for (n, v) in
             hubris.qualified_variables().filter(|&(n, _)| m(n, variable))
         {
             readvar_dump(hubris, core, v, n, &subargs)?;
+            found = true;
+        }
+        if !found {
+            bail!("variable '{variable}' not found; use \"-l\" to list");
         }
     } else {
         bail!("expected variable (use \"-l\" to list)");

humility-core/src/core.rs

@@ -148,47 +148,47 @@ impl Core for UnattachedCore {
     }
 
     fn read_8(&mut self, _addr: u32, _data: &mut [u8]) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::read_8 unimplemented when unattached!");
     }
 
     fn read_reg(&mut self, _reg: ARMRegister) -> Result<u32> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::read_reg unimplemented when unattached!");
     }
 
     fn write_reg(&mut self, _reg: ARMRegister, _value: u32) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::write_reg unimplemented when unattached!");
     }
 
     fn write_word_32(&mut self, _addr: u32, _data: u32) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::write_word_32 unimplemented when unattached!");
     }
 
     fn write_8(&mut self, _addr: u32, _data: &[u8]) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::write_8 unimplemented when unattached!");
     }
 
     fn halt(&mut self) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::halt unimplemented when unattached!");
     }
 
     fn run(&mut self) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::run unimplemented when unattached!");
     }
 
     fn step(&mut self) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::step unimplemented when unattached!");
     }
 
     fn init_swv(&mut self) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::init_swv unimplemented when unattached!");
     }
 
     fn read_swv(&mut self) -> Result<Vec<u8>> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::read_swv unimplemented when unattached!");
     }
 
     fn load(&mut self, _path: &Path) -> Result<()> {
-        bail!("Unimplemented when unattached!");
+        bail!("Core::load unimplemented when unattached!");
     }
 
     fn reset(&mut self) -> Result<()> {

humility-net-core/src/lib.rs

@@ -221,7 +221,8 @@ impl NetCore {
             // least one task associated with it.  If this task is the
             // supervisor, then that's bad news.
             let region = ram[p - 1].clone();
-            let Some(&task) = region.tasks.iter().find(|t| t.task() != 0) else {
+            let Some(&task) = region.tasks.iter().find(|t| t.task() != 0)
+            else {
                 bail!("supervisor memory cannot be read using dump facilities");
             };