change

.gitea/workflows/rust.yaml

@@ -0,0 +1,31 @@
+name: Rust
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          components: rustfmt, clippy
+      - uses: actions-rs/cargo@v1
+        name: Check format
+        with:
+          command: fmt
+          args: --all -- --check
+      - uses: actions-rs/cargo@v1
+        name: Run clippy
+        with:
+          command: clippy
+          args: --all-targets --locked -- -D warnings
+      - uses: actions-rs/cargo@v1
+        name: Run tests
+        with:
+          command: test

.woodpecker.yml

@@ -34,7 +34,7 @@ pipeline:
     commands:
       - dpkg --add-architecture armel
       - apt-get update
-      - apt-get install -y crossbuild-essential-armel libdbus-1-dev:armel --no-install-recommends
+      - apt-get install -y crossbuild-essential-armel libdbus-1-dev:armel libdbus-1-3:armel --no-install-recommends
       - rustup target add arm-unknown-linux-gnueabi
       - PKG_CONFIG=arm-linux-gnueabi-pkg-config CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc cargo build --release --target arm-unknown-linux-gnueabi
       - mv target/arm-unknown-linux-gnueabi/release/alma alma-arm

Cargo.toml

@@ -5,16 +5,16 @@ authors = ["Roey Darwish Dror, PurpleCow"]
 edition = "2021"
 
 [dependencies]
-which = "4.4"
+which = "7.0.3"
-log = "0.4"
+log = "0.4.27"
-structopt = "0.3"
+structopt = "0.3.26"
 tempfile = "3"
 serde = { version = "1", features = ["derive"] }
-toml = "0.7"
+toml = "0.8.22"
-byte-unit = "4.0"
+byte-unit = "5.1.6"
-nix = "0.26"
+nix = { version = "0.30.1", features = ["mount"] }
-env_logger = "0.10"
+env_logger = "0.11.8"
 pretty_env_logger = "0.5"
-dialoguer = "0.10"
+dialoguer = "0.11"
-console = "0.15"
+console = "0.15.11"
 anyhow = "1"

gitea/workflows/rust.yaml

@@ -0,0 +1,31 @@
+name: Rust
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          components: rustfmt, clippy
+      - uses: actions-rs/cargo@v1
+        name: Check format
+        with:
+          command: fmt
+          args: --all -- --check
+      - uses: actions-rs/cargo@v1
+        name: Run clippy
+        with:
+          command: clippy
+          args: --all-targets --locked -- -D warnings
+      - uses: actions-rs/cargo@v1
+        name: Run tests
+        with:
+          command: test

src/args.rs

@@ -6,7 +6,7 @@ use structopt::StructOpt;
 /// Parse size argument as bytes
 /// e.g. 10GB, 10GiB, etc.
 fn parse_bytes(src: &str) -> Result<Byte, &'static str> {
-    Byte::from_str(src).map_err(|_| "Invalid image size")
+    Byte::parse_str(src, false).map_err(|_| "Invalid image size")
 }
 
 #[derive(StructOpt)]

src/main.rs

@@ -78,7 +78,7 @@ fn create_image(path: &Path, size: Byte, overwrite: bool) -> anyhow::Result<Loop
         }
         let file = options.open(path).context("Error creating the image")?;
 
-        file.set_len(size.get_bytes() as u64)
+        file.set_len(size.as_u64())
             .context("Error creating the image")?;
     }
 

src/storage/mount_stack.rs

@@ -23,7 +23,7 @@ impl<'a> MountStack<'a> {
         filesystem: &'a Filesystem,
         target: PathBuf,
         options: Option<&str>,
-    ) -> nix::Result<()> {
+    ) -> Result<(), nix::Error> {
         let source = filesystem.block().path();
         debug!("Mounting {:?} to {:?}", filesystem, target);
         mount(
@@ -42,7 +42,7 @@ impl<'a> MountStack<'a> {
         source: PathBuf,
         target: PathBuf,
         options: Option<&str>,
-    ) -> nix::Result<()> {
+    ) -> Result<(), nix::Error> {
         debug!("Mounting {:?} to {:?}", source, target);
         mount::<_, _, str, _>(
             Some(&source),

src/storage/removeable_devices.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use byte_unit::Byte;
+use byte_unit::{Byte, UnitType};
 use std::{fmt, fs};
 
 #[derive(Debug)]
@@ -17,7 +17,7 @@ impl fmt::Display for Device {
             "{} {} ({})",
             self.vendor,
             self.model,
-            self.size.get_appropriate_unit(true)
+            self.size.get_appropriate_unit(UnitType::Decimal)
         )
     }
 }
@@ -60,14 +60,14 @@ pub fn get_storage_devices(allow_non_removable: bool) -> anyhow::Result<Vec<Devi
             vendor: fs::read_to_string(entry.path().join("device/vendor"))
                 .map(trimmed)
                 .context("Error querying storage devices")?,
-            size: Byte::from_bytes(
+            size: Byte::from_u128(
                 fs::read_to_string(entry.path().join("size"))
                     .context("Error querying storage devices")?
                     .trim()
                     .parse::<u128>()
                     .context("Could not parse block size to unsigned integer (u128)")?
                     * 512,
-            ),
+            ).expect("Invalid byte size"),
         });
     }