Skip to content

Commit 10d536f

Browse files
Merge pull request #1564 from GuillaumeGomez/edition-2024
Switch to 2024 edition and update MSRV to 1.85
2 parents fc31b41 + 61033e9 commit 10d536f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1446
-1300
lines changed

.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
task:
2-
name: rust 1.75 on freebsd 13
2+
name: rust 1.85 on freebsd 13
33
freebsd_instance:
44
image: freebsd-13-1-release-amd64
55
setup_script:
66
- curl https://sh.rustup.rs -sSf --output rustup.sh
7-
- sh rustup.sh -y --profile=minimal --default-toolchain=1.75
7+
- sh rustup.sh -y --profile=minimal --default-toolchain=1.85
88
- . $HOME/.cargo/env
99
- rustup --version
1010
- rustup component add clippy
@@ -59,14 +59,14 @@ task:
5959
- FREEBSD_CI=1 cargo test --lib -- --test-threads=1
6060

6161
task:
62-
name: rust 1.75 on mac m1
62+
name: rust 1.85 on mac m1
6363
macos_instance:
6464
image: ghcr.io/cirruslabs/macos-monterey-base:latest
6565
setup_script:
6666
- brew update
6767
- brew install curl
6868
- curl https://sh.rustup.rs -sSf --output rustup.sh
69-
- sh rustup.sh -y --profile=minimal --default-toolchain=1.75
69+
- sh rustup.sh -y --profile=minimal --default-toolchain=1.85
7070
- source $HOME/.cargo/env
7171
- rustup --version
7272
- rustup component add clippy

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- { os: 'ubuntu-latest', target: 'x86_64-linux-android', cross: true }
7474
- { os: 'ubuntu-latest', target: 'i686-linux-android', cross: true }
7575
toolchain:
76-
- "1.75.0" # minimum supported rust version
76+
- "1.85.0" # minimum supported rust version
7777
- stable
7878
- nightly
7979
steps:
@@ -240,7 +240,7 @@ jobs:
240240
- macos-latest
241241
- windows-latest
242242
toolchain:
243-
- "1.75.0" # minimum supported rust version
243+
- "1.85.0" # minimum supported rust version
244244
- stable
245245
- nightly
246246
steps:
@@ -302,7 +302,7 @@ jobs:
302302
strategy:
303303
matrix:
304304
toolchain:
305-
- "1.75.0" # minimum supported rust version
305+
- "1.85.0" # minimum supported rust version
306306
- stable
307307
steps:
308308
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ description = "Library to get system information such as processes, CPUs, disks,
66
repository = "https://github.com/GuillaumeGomez/sysinfo"
77
license = "MIT"
88
readme = "README.md"
9-
rust-version = "1.75"
9+
rust-version = "1.85"
1010
exclude = ["/test-unknown"]
1111
keywords = ["system-information", "disk", "process", "network", "cpu"]
12-
edition = "2021"
12+
edition = "2024"
1313

1414
[lib]
1515
name = "sysinfo"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can still use `sysinfo` on non-supported OSes, it'll simply do nothing and a
1818
empty values. You can check in your program directly if an OS is supported by checking the
1919
[`IS_SUPPORTED_SYSTEM`] constant.
2020

21-
The minimum-supported version of `rustc` is **1.75**.
21+
The minimum-supported version of `rustc` is **1.85**.
2222

2323
## Usage
2424

examples/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use std::io::{self, BufRead, Write};
88
use std::str::FromStr;
9-
use sysinfo::{Components, Disks, Groups, Networks, Pid, System, Users, SUPPORTED_SIGNALS};
9+
use sysinfo::{Components, Disks, Groups, Networks, Pid, SUPPORTED_SIGNALS, System, Users};
1010

1111
fn print_help() {
1212
println!(

0 commit comments

Comments
 (0)