Merge pull request #105 from collabora/set-mrsv-and-update-to-2024

Set mrsv to 1.85 and update to edition 2024

Author: sjoerdsimons

Cargo.toml

@@ -3,9 +3,13 @@ members = [
   "bmap-parser",
   "bmap-rs",
 ]
+resolver = "3"
 
 # Most of the actual work is CPU-heavy, in particular the rust sha2
 # implementation so use full optimisations otherwise everything will run quite
 # slow
 [profile.dev]
 opt-level = 3
+
+[workspace.package]
+rust-version = "1.85"

bmap-parser/Cargo.toml

@@ -2,11 +2,12 @@
 name = "bmap-parser"
 version = "0.2.0"
 authors = ["Sjoerd Simons <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT AND Apache-2.0"
 description = "bmap-parser is a library for Rust that allows you to copy files or flash block devices safely"
 repository = "https://github.com/collabora/bmap-rs"
 readme = "../README.md"
+rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

bmap-parser/src/bmap/xml.rs

@@ -1,5 +1,5 @@
 use crate::bmap::{BmapBuilder, BmapBuilderError, HashType, HashValue};
-use quick_xml::de::{from_str, DeError};
+use quick_xml::de::{DeError, from_str};
 use serde::Deserialize;
 use std::str::FromStr;
 use thiserror::Error;

bmap-parser/src/lib.rs

@@ -3,8 +3,8 @@ pub use crate::bmap::*;
 mod discarder;
 pub use crate::discarder::*;
 use async_trait::async_trait;
-use futures::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt};
 use futures::TryFutureExt;
+use futures::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt};
 use sha2::{Digest, Sha256};
 use thiserror::Error;
 

bmap-rs/Cargo.toml

@@ -2,11 +2,12 @@
 name = "bmap-rs"
 version = "0.2.0"
 authors = ["Sjoerd Simons <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT AND Apache-2.0"
 description = "bmap-rs is an application that handles the use of bmap crate"
 repository = "https://github.com/collabora/bmap-rs"
 readme = "../README.md"
+rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

bmap-rs/src/main.rs

@@ -1,7 +1,7 @@
-use anyhow::{anyhow, bail, ensure, Context, Result};
+use anyhow::{Context, Result, anyhow, bail, ensure};
 use async_compression::futures::bufread::GzipDecoder;
 use bmap_parser::{AsyncDiscarder, Bmap, Discarder, SeekForward};
-use clap::{arg, command, Arg, ArgAction, Command};
+use clap::{Arg, ArgAction, Command, arg, command};
 use flate2::read::GzDecoder;
 use futures::TryStreamExt;
 use indicatif::{ProgressBar, ProgressState, ProgressStyle};
@@ -241,7 +241,7 @@ async fn copy_remote_input(source: Url, destination: PathBuf) -> Result<()> {
     let res = setup_remote_input(source).await?;
     let stream = res
         .bytes_stream()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+        .map_err(std::io::Error::other)
         .into_async_read();
     let reader = GzipDecoder::new(stream);
     let mut input = AsyncDiscarder::new(reader);
@@ -291,7 +291,7 @@ async fn copy_remote_input_nobmap(source: Url, destination: PathBuf) -> Result<(
     let res = setup_remote_input(source).await?;
     let stream = res
         .bytes_stream()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+        .map_err(std::io::Error::other)
         .into_async_read();
     let reader = GzipDecoder::new(stream);
     let mut input = AsyncDiscarder::new(reader);