Skip to content

Compatible with Rust 2024 Edition #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phoepsilonix wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −8
Open

Compatible with Rust 2024 Edition #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b341ce3
Compatible with Rust 2024 Edition
phoepsilonix Jan 18, 2026
165beec
raur and reqwest update
phoepsilonix Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "paru"
version = "2.1.0"
authors = ["morganamilo <morganamilo@archlinux.org>"]
edition = "2021"
edition = "2024"

description = "Feature packed AUR helper"
homepage = "https://github.com/Morganamilo/paru"
Expand All @@ -21,7 +21,7 @@ aur-depends = "5.0.0"
aur-fetch = "0.11.3"
cini = "1.0.0"
pacmanconf = "3.1.0"
raur = "7.0.0"
raur = { version = "8.0.0" , default-features = false, features = ["reqwest", "async", "native-tls"] }
srcinfo = "2.1.0"


Expand All @@ -35,7 +35,7 @@ htmlescape = "0.3.1"
indicatif = "0.18.3"
scraper = "0.25.0"
nix = { version = "0.30.1", features = ["fs", "user"] }
reqwest = { version = "0.11.27", features = ["gzip", "socks"] }
reqwest = { version = "0.13.1", default-features = false, features = ["rustls-no-provider", "form", "gzip", "socks", "charset", "http2", "system-proxy"] }
rss = { version = "2.0.12", default-features = false }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
Expand Down Expand Up @@ -78,3 +78,4 @@ mock_chroot = ["mock"]
#aur-depends = { path = "../aur-depends" }
#srcinfo = { path = "../srcinfo.rs" }
#aur-fetch = { path = "../aur-fetch" }
#raur = { path = "../raur" }
6 changes: 4 additions & 2 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,8 @@ then initialise it with:
}

if self.chroot {
remove_var("PKGEXT");
// TODO: Audit that the environment access only happens in single-threaded code.
unsafe { remove_var("PKGEXT") };
}

Ok(())
Expand Down Expand Up @@ -995,7 +996,8 @@ then initialise it with:
);

self.env.push((key.to_owned(), value.to_string()));
set_var(key, value);
// TODO: Audit that the environment access only happens in single-threaded code.
unsafe { set_var(key, value) };
Ok(())
}

Expand Down
6 changes: 3 additions & 3 deletions src/devel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,15 @@ async fn ls_remote(
let future = ls_remote_internal(git, flags, remote, branch);
let future = timeout(time, future);

if let Ok(v) = future.await {
match future.await { Ok(v) => {
v
} else {
} _ => {
print_error(
style,
anyhow!("timed out looking for devel update: {}", remote),
);
bail!("")
}
}}
}

fn parse_url(source: &str) -> Option<(String, &'_ str, Option<&'_ str>)> {
Expand Down