Merge branch 'master' into openocd-hex

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.9"
+version = "0.11.10"
 authors = ["Bryan Cantrill <bryan@oxide.computer>"]
 edition = "2018"
 license = "MPL-2.0"

cmd/rebootleby/src/lib.rs

@@ -42,13 +42,20 @@ fn rebootleby(context: &mut ExecutionContext) -> Result<()> {
     let mut zip =
         ZipArchive::new(bundle_reader).context("opening bundle file as ZIP")?;
 
-    let img_bootleby = {
+    let img_bootleby = if zip.file_names().any(|x| x == "bootleby.bin") {
         let mut entry = zip
             .by_name("bootleby.bin")
             .context("can't find bootleby.bin in bundle")?;
         let mut data = vec![];
         entry.read_to_end(&mut data).context("reading bootleby.bin")?;
         data
+    } else {
+        let mut entry = zip
+            .by_name("img/final.bin")
+            .context("can't find bootleby.bin or img/final.bin in bundle")?;
+        let mut data = vec![];
+        entry.read_to_end(&mut data).context("reading bootleby.bin")?;
+        data
     };
     let img_cmpa = {
         let mut entry =

tests/cli_tests.rs

@@ -76,7 +76,7 @@ fn make_tests(tests: &[Test], kind: Kind) -> Result<()> {
 
         if let Some(f) = path.file_name() {
             if let Some(s) = f.to_str() {
-                if let Some(name) = s.strip_prefix(&kind.prefix()) {
+                if let Some(name) = s.strip_prefix(kind.prefix()) {
                     input.push((name.to_string(), s.to_string()));
                 }
             }
@@ -112,7 +112,7 @@ fn make_tests(tests: &[Test], kind: Kind) -> Result<()> {
                 let testcmd = if let Some(arg) = test.arg {
                     format!("{} {arg}", test.cmd)
                 } else {
-                    format!("{}", test.cmd)
+                    test.cmd.to_string()
                 };
 
                 writeln!(

tests/cmd/chip.trycmd

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

tests/cmd/version.trycmd

@@ -2,14 +2,14 @@ Long version flag:
 
 ```
 $ humility --version
-humility 0.11.9
+humility 0.11.10
 
 ```
 
 Short version flag:
 
 ```
 $ humility -V
-humility 0.11.9
+humility 0.11.10
 
 ```