chore: bump to edition 2024 and rust 1.86 (#32)

Author: sjoerdsimons

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master # avoid the tag here to prevent dependabot from updating it
         with:
-          toolchain: "1.75"
+          toolchain: "1.86"
       - run: cargo check --all-targets --all-features
 
   fmt:
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master # avoid the tag here to prevent dependabot from updating it
         with:
-          toolchain: "1.75"
+          toolchain: "1.86"
           components: rustfmt
       - run: cargo fmt --all --check
 
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master # avoid the tag here to prevent dependabot from updating it
         with:
-          toolchain: "1.75"
+          toolchain: "1.86"
       - run: cargo test --all-targets --all-features
 
   clippy:
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master # avoid the tag here to prevent dependabot from updating it
         with:
-          toolchain: "1.75"
+          toolchain: "1.86"
           components: clippy
       - run: cargo clippy --all-targets --all-features -- -D warnings
 

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "3"
 members = [
   "oscrc",
   "obsctl",

obsctl/Cargo.toml

@@ -2,7 +2,7 @@
 name = "obsctl"
 version = "0.1.0"
 authors = ["Sjoerd Simons <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

obsctl/src/main.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use clap::Parser;
 use open_build_service_api::{Client, PackageCode, ResultListResult};
 use oscrc::Oscrc;

open-build-service-api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "open-build-service-api"
 version = "0.1.0"
 authors = ["Sjoerd Simons <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

open-build-service-api/examples/obsapi.rs

@@ -50,7 +50,7 @@ async fn log(client: Client, opts: PackageFull) -> Result<()> {
     let log = p.log(&opts.repository, &opts.arch);
 
     let (size, mtime) = log.entry().await?;
-    println!("Log: size: {}, mtime: {}", size, mtime);
+    println!("Log: size: {size}, mtime: {mtime}");
 
     let mut stdout = tokio::io::stdout();
 

open-build-service-api/src/lib.rs

@@ -5,9 +5,9 @@ use futures::ready;
 use futures::stream::BoxStream;
 use md5::{Digest, Md5};
 use quick_xml::{de::DeError, events::Event};
-use reqwest::{header::CONTENT_TYPE, Body, Method, RequestBuilder, Response};
+use reqwest::{Body, Method, RequestBuilder, Response, header::CONTENT_TYPE};
 use serde::de::IntoDeserializer;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use std::collections::HashMap;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -577,7 +577,7 @@ impl<'a> PackageLogStream<'a> {
         let mut url = self.url.clone();
         url.query_pairs_mut()
             .append_pair("nostream", "1")
-            .append_pair("start", &format!("{}", offset));
+            .append_pair("start", &format!("{offset}"));
         if let Some(end) = self.options.end {
             url.query_pairs_mut().append_pair("end", &end.to_string());
         }

open-build-service-api/tests/integration.rs

@@ -440,7 +440,7 @@ async fn test_commits() {
         assert_eq!(missing.entries[0].name, test_entry.name);
         assert_eq!(missing.entries[0].md5, test_entry.md5);
     } else {
-        panic!("Expected missing entries, got {:?}", commit_result);
+        panic!("Expected missing entries, got {commit_result:?}");
     }
 
     package_1
@@ -462,7 +462,7 @@ async fn test_commits() {
         assert_eq!(directory.entries[0].name, test_entry.name);
         assert_eq!(directory.entries[0].md5, test_entry.md5);
     } else {
-        panic!("Expected missing entries, got {:?}", commit_result);
+        panic!("Expected missing entries, got {commit_result:?}");
     }
 
     let directory = package_1.list(None).await.unwrap();
@@ -482,8 +482,8 @@ async fn test_branch() {
     let test_file = "test";
     let test_contents = b"some file contents here";
 
-    let test_project_branched_1 = format!("home:{}:branches:{}", DEFAULT_USERNAME, TEST_PROJECT);
-    let test_project_branched_2 = format!("{}:branch", TEST_PROJECT);
+    let test_project_branched_1 = format!("home:{DEFAULT_USERNAME}:branches:{TEST_PROJECT}");
+    let test_project_branched_2 = format!("{TEST_PROJECT}:branch");
 
     let mock = start_mock().await;
     mock.add_project(TEST_PROJECT.to_owned());

open-build-service-mock/Cargo.toml

@@ -2,7 +2,7 @@
 name = "open-build-service-mock"
 version = "0.1.0"
 authors = ["Sjoerd Simons <[email protected]>"]
-edition = "2018"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html