Skip to content

Commit b7e7e35

Browse files
committedMar 19, 2025
chore: update all deps and use 2024 Rust edition
1 parent 9182de9 commit b7e7e35

File tree

10 files changed

+160
-55
lines changed

10 files changed

+160
-55
lines changed
 

‎Cargo.lock

+128-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name = "aoscbootstrap"
33
version = "0.8.5"
44
description = "Helper for bootstrapping AOSC OS from scratch"
55
authors = ["liushuyu <liushuyu011@gmail.com>"]
6-
edition = "2021"
6+
edition = "2024"
77

88
[dependencies]
99
reqwest = { version = "0.12", features = ["blocking"] }
1010
serde = { version = "1.0", features = ["derive"] }
11-
rand = "0.8"
11+
rand = "0.9"
1212
which = "7"
1313
toml = "0.8"
1414
ar = "0.9"
@@ -20,18 +20,17 @@ sha2 = "0.10"
2020
rayon = "1.8"
2121
libloading = "0.8"
2222
libsolv-sys = "0.1"
23-
libc = "0.2"
2423
url = "2.4"
2524
faster-hex = "0.10"
2625
xz2 = "0.1"
2726
tempfile = "3.8"
28-
bytesize = "1.3"
27+
bytesize = "2"
2928
fs3 = "0.5"
3029
num_cpus = "1.16"
3130
owo-colors = "^4"
3231
flate2 = "1.0"
3332
oma-debcontrol = "0.3"
34-
oma-repo-verify = { version = "0.5", default-features = false, features = ["sequoia-openssl-backend"] }
33+
oma-repo-verify = "0.6"
3534
zstd = "0.13"
3635
serde_json = "1.0.132"
3736
libaosc = { version = "0.2", default-features = false }

‎src/fs.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
use anyhow::{anyhow, Result};
2-
use flate2::write::GzEncoder;
1+
use anyhow::{Result, anyhow};
32
use flate2::Compression;
4-
use nix::fcntl::{open, OFlag};
5-
use nix::sys::stat::{fchmodat, FchmodatFlags, Mode};
3+
use flate2::write::GzEncoder;
4+
use nix::fcntl::{OFlag, open};
5+
use nix::sys::stat::{FchmodatFlags, Mode, fchmodat};
66
use nix::unistd::close;
77
use sha2::{Digest, Sha256};
88
use std::io::Write;
99
use std::path::Path;
1010
use std::process::Command;
1111
use std::{
12-
fs::{create_dir_all, write, File},
12+
fs::{File, create_dir_all, write},
1313
io::Read,
1414
};
1515
use tar::Builder;

‎src/guest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use std::{
66
time::Duration,
77
};
88

9-
use anyhow::{anyhow, Result};
10-
use libc::{c_char, c_int};
9+
use anyhow::{Result, anyhow};
1110
use libloading::{Library, Symbol};
11+
use nix::libc::{c_char, c_int};
1212
use rand::random;
1313

1414
#[allow(non_camel_case_types)]

‎src/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::{
55
path::Path,
66
};
77

8-
use anyhow::{anyhow, Result};
8+
use anyhow::{Result, anyhow};
99
use ar::Archive as ArArchive;
1010
use serde::Deserialize;
1111
use tar::Archive as TarArchive;

0 commit comments

Comments
 (0)