Bump Rust version

Author: sharkdp

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.74.0
+          - 1.85.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -37,7 +37,7 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.74.0
+          - 1.85.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -66,6 +66,14 @@ jobs:
       fail-fast: false
       matrix:
         job:
+          # Ubuntu 24.04
+          - { os: ubuntu-24.04 , target: x86_64-unknown-linux-gnu    , use-cross: false }
+          - { os: ubuntu-24.04 , target: x86_64-unknown-linux-musl   , use-cross: true }
+          - { os: ubuntu-24.04 , target: arm-unknown-linux-gnueabihf , use-cross: true }
+          - { os: ubuntu-24.04 , target: aarch64-unknown-linux-gnu   , use-cross: true }
+          - { os: ubuntu-24.04 , target: i586-unknown-linux-gnu      , use-cross: true }
+          - { os: ubuntu-24.04 , target: i686-unknown-linux-gnu      , use-cross: true }
+          - { os: ubuntu-24.04 , target: i686-unknown-linux-musl     , use-cross: true }
           # Ubuntu 22.04
           - { os: ubuntu-22.04 , target: x86_64-unknown-linux-gnu    , use-cross: false }
           - { os: ubuntu-22.04 , target: x86_64-unknown-linux-musl   , use-cross: true }
@@ -74,18 +82,8 @@ jobs:
           - { os: ubuntu-22.04 , target: i586-unknown-linux-gnu      , use-cross: true }
           - { os: ubuntu-22.04 , target: i686-unknown-linux-gnu      , use-cross: true }
           - { os: ubuntu-22.04 , target: i686-unknown-linux-musl     , use-cross: true }
-          # Ubuntu 20.04
-          - { os: ubuntu-20.04 , target: x86_64-unknown-linux-gnu    , use-cross: false }
-          - { os: ubuntu-20.04 , target: x86_64-unknown-linux-musl   , use-cross: true }
-          - { os: ubuntu-20.04 , target: arm-unknown-linux-gnueabihf , use-cross: true }
-          - { os: ubuntu-20.04 , target: aarch64-unknown-linux-gnu   , use-cross: true }
-          - { os: ubuntu-20.04 , target: i586-unknown-linux-gnu      , use-cross: true }
-          - { os: ubuntu-20.04 , target: i686-unknown-linux-gnu      , use-cross: true }
-          - { os: ubuntu-20.04 , target: i686-unknown-linux-musl     , use-cross: true }
           # MacOS 14
           - { os: macos-14     , target: aarch64-apple-darwin        , use-cross: false }
-          # Macos 13
-          - { os: macos-13     , target: x86_64-apple-darwin         , use-cross: false }
           # Windows 2022
           - { os: windows-2022 , target: i686-pc-windows-msvc        , use-cross: false }
           - { os: windows-2022 , target: x86_64-pc-windows-gnu       , use-cross: false }
@@ -137,7 +135,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.0
+          toolchain: 1.85.0
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
@@ -154,7 +152,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.74.0
+          toolchain: 1.85.0
           override: true
       - run: rustup component add clippy
       - uses: actions-rs/cargo@v1

Cargo.toml

@@ -4,17 +4,12 @@ description = "Collect system and environment information for bug reports"
 categories = ["command-line-interface"]
 homepage = "https://github.com/sharkdp/bugreport"
 repository = "https://github.com/sharkdp/bugreport"
-keywords = [
-    "bugreport",
-    "diagnostics",
-    "cross-platform",
-    "cli",
-    "terminal"
-]
+keywords = ["bugreport", "diagnostics", "cross-platform", "cli", "terminal"]
 license = "MIT/Apache-2.0"
 authors = ["David Peter <mail@david-peter.de>"]
-edition = "2018"
+edition = "2024"
 version = "0.5.1"
+rust-version = "1.85"
 
 [features]
 default = ["collector_operating_system", "git_hash", "format_markdown"]

examples/custom_collector.rs

@@ -1,6 +1,6 @@
 use std::result::Result;
 
-use bugreport::{bugreport, collector::*, format::Markdown, report::ReportEntry, CrateInfo};
+use bugreport::{CrateInfo, bugreport, collector::*, format::Markdown, report::ReportEntry};
 
 struct MyCollector {}
 

src/collector/directory_entries.rs

@@ -3,7 +3,7 @@ use std::fs::{self, DirEntry};
 use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
 
-use crate::{report::ReportEntry, Collector, CrateInfo, Result};
+use crate::{Collector, CrateInfo, Result, report::ReportEntry};
 
 use super::CollectionError;
 

src/lib.rs

@@ -68,7 +68,7 @@ impl<'a> BugReport<'a> {
         self
     }
 
-    fn generate(&mut self) -> Report {
+    fn generate(&mut self) -> Report<'_> {
         let mut sections = vec![];
 
         for collector in &mut self.collectors {
@@ -141,7 +141,9 @@ mod tests {
         use crate::collector::*;
         use crate::format::Markdown;
 
-        std::env::set_var("BUGREPORT_TEST", "42");
+        unsafe {
+            std::env::set_var("BUGREPORT_TEST", "42");
+        }
 
         let report = BugReport::from_name_and_version("dummy", "0.1")
             .info(EnvironmentVariables::list(&["BUGREPORT_TEST"]))

tests/test_collector_directory_entries.rs

@@ -88,7 +88,7 @@ fn dir_exists() -> Result<(), std::io::Error> {
 fn new() {
     DirectoryEntries::new("a", "/a");
     // Not possible yet: DirectoryEntries::new(String::from("b"), PathBuf::from("/b"));
-    DirectoryEntries::new(&String::from("c"), &PathBuf::from("/c"));
+    DirectoryEntries::new(&String::from("c"), PathBuf::from("/c"));
     new_with_title_from_local_variable();
 }