Skip to content

Commit 93504ae

Browse files
Update all dependencies
1 parent dd51a7b commit 93504ae

File tree

8 files changed

+1634
-603
lines changed

8 files changed

+1634
-603
lines changed

Cargo.lock

Lines changed: 1597 additions & 569 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@ build = "build.rs"
1818
default=["testpacman", "rustls-tls"]
1919
testpacman = [] # whether to perform pacman checks on tests
2020
native-tls = ["raur/native-tls"] # build with support for OS native TLS
21-
rustls-tls = ["raur/rustls-tls"] # build with rustls TLS
21+
rustls-tls = ["raur/rusttls-tls"] # build with rustls TLS
2222

2323
[build-dependencies]
2424
structopt = "0.3.26"
2525
libscmp = "0.2.0"
2626

2727
[dependencies]
28-
alpm = { version = "2.2.3", default-features = false, features = [], optional = true }
29-
anyhow = { version = "1.0.79", default-features = false, features = ["std", "backtrace"] }
30-
chrono = { version = "0.4.31", default-features = false, features = ["std", "clock"] }
31-
colored = "2.0.2"
32-
directories = "5.0.1"
33-
env_logger = "0.10.1"
28+
alpm = { version = "5.0.2", default-features = false, features = [], optional = true }
29+
anyhow = { version = "1.0.100", default-features = false, features = ["std", "backtrace"] }
30+
chrono = { version = "0.4.43", default-features = false, features = ["std", "clock"] }
31+
colored = "3.1.1"
32+
directories = "6.0.0"
33+
env_logger = "0.11.9"
3434
fs2 = "0.4.3"
3535
fs_extra = "1.3.0"
36-
indexmap = { version = "1.9.3", default-features = false }
37-
itertools = { version = "0.11.0", default-features = false, features = ["use_std"] }
38-
lazy_static = "1.4.0"
39-
libc = { version = "0.2.151", default-features = false }
40-
libflate = "2.0.0"
41-
log = { version = "0.4.20", default-features = false }
36+
indexmap = { version = "2.13.0", default-features = false }
37+
itertools = { version = "0.14.0", default-features = false, features = ["use_std"] }
38+
lazy_static = "1.5.0"
39+
libc = { version = "0.2.163", default-features = false }
40+
libflate = "2.2.1"
41+
log = { version = "0.4.28", default-features = false }
4242
prettytable-rs = "0.10.0"
43-
raur = { version = "7.0.0", default-features = false, features = ["blocking", "rustls-tls"] }
43+
raur = { version = "8.0.0", default-features = false, features = ["blocking", "rusttls-tls"] }
4444
regex = { version = "1.9.6", default-features = false, features = ["perf"] }
4545
rm_rf = "0.6.2"
46-
ruzstd = "0.4.0"
47-
srcinfo = "1.1.0"
46+
ruzstd = "0.8.2"
47+
srcinfo = "2.1"
4848
structopt = "0.3.26"
49-
tar = { version = "0.4.40", default-features = false }
50-
termize = "0.1.1"
49+
tar = { version = "0.4.44", default-features = false }
50+
termize = "0.2.1"
5151
uname = "0.1.1"
5252
xz2 = "0.1.7"
5353

docs/updating_dependencies.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ cargo upgrade --dry-run
2727

2828
The output may show some crates as `incompatible`: the latest version bumps the major (or minor, for 0.x) version and may break the API. By default `cargo upgrade` only bumps to the latest *compatible* version for those; `new req` stays within semver.
2929

30-
# When a crate is incompatible
30+
## Finding missing upgrades
31+
`cargo upgrade` still misses some dependencies. You can see which ones were not updated by running
3132

32-
If you want to adopt an incompatible upgrade: Run `cargo upgrade -p crate_name --incompatible` (or edit `Cargo.toml` and run `cargo update`). Fix compile errors and any behavioural changes, then run `cargo test` and the linters.
33+
```sh
34+
cargo update --verbose
35+
```
36+
and then manually updating the cargo.toml with those versions
3337

3438

3539
# After updating

src/action_builddir.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ pub fn action_builddir(dir: &Option<PathBuf>, rua_paths: &RuaPaths, offline: boo
2222

2323
let srcinfo = wrapped::generate_srcinfo(dir_str, rua_paths).expect("Failed to obtain SRCINFO");
2424
let ver = srcinfo.version();
25-
let packages = srcinfo.pkgs.iter().map(|package| {
26-
let arch = if package.arch.contains(&*pacman::PACMAN_ARCH) {
25+
let packages = srcinfo.pkgs().iter().map(|package| {
26+
let arch = if package.arch().contains(&*pacman::PACMAN_ARCH) {
2727
pacman::PACMAN_ARCH.to_string()
2828
} else {
2929
"any".to_string()

src/action_install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn install_all(
128128
.unique_by(|(pkgbase, _depth, _split)| pkgbase.to_string())
129129
.collect::<Vec<_>>();
130130
// once we have a collection of pkgname-s and their depth, proceed straightforwardly.
131-
for (depth, packages) in &packages.iter().group_by(|(_pkgbase, depth, _split)| *depth) {
131+
for (depth, packages) in &packages.iter().chunk_by(|(_pkgbase, depth, _split)| *depth) {
132132
let packages = packages.collect::<Vec<&(String, i32, String)>>();
133133
for (pkgbase, _depth, _split) in &packages {
134134
let review_dir = rua_paths.review_dir(pkgbase);

src/print_format.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use anyhow::anyhow;
22
use anyhow::Result;
3-
use chrono::NaiveDateTime;
3+
use chrono::DateTime;
44
use colored::*;
55

66
const DATE_FORMAT: &str = "%Y-%m-%d %H:%M:%S UTC";
@@ -10,7 +10,7 @@ pub fn opt(opt: &Option<String>) -> &str {
1010
}
1111

1212
pub fn date(timestamp: i64) -> Result<String> {
13-
match NaiveDateTime::from_timestamp_opt(timestamp, 0) {
13+
match DateTime::from_timestamp(timestamp, 0) {
1414
Some(dt) => Ok(dt.format(DATE_FORMAT).to_string()),
1515
None => Err(anyhow!(
1616
"Cannot convert timestamp {} to date/time",

src/srcinfo_to_pkgbuild.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::terminal_util::escape_bash_arg;
2-
use srcinfo::ArchVec;
3-
use srcinfo::Srcinfo;
2+
use srcinfo::{ArchVecs, Srcinfo};
43
use std::path::Path;
54

65
fn push_field(pkgbuild: &mut String, key: &str, value: &str) {
@@ -17,26 +16,26 @@ fn push_array(pkgbuild: &mut String, key: &str, values: &[String]) {
1716
pkgbuild.push_str(")\n");
1817
}
1918

20-
fn push_arrays(pkgbuild: &mut String, key: &str, arch_values: &[ArchVec]) {
19+
fn push_arrays(pkgbuild: &mut String, key: &str, arch_values: &ArchVecs) {
2120
for values in arch_values {
22-
if let Some(ref arch) = values.arch {
21+
if let Some(arch) = values.arch() {
2322
let key = &format!("{}_{}", key, arch);
24-
push_array(pkgbuild, key, &values.vec);
23+
push_array(pkgbuild, key, values.values());
2524
} else {
26-
push_array(pkgbuild, key, &values.vec);
25+
push_array(pkgbuild, key, values.values());
2726
};
2827
}
2928
}
3029

3130
pub fn static_pkgbuild(path: &Path) -> String {
32-
let srcinfo = Srcinfo::parse_file(path)
31+
let srcinfo = Srcinfo::from_path(path)
3332
.unwrap_or_else(|e| panic!("{}:{} Failed to parse {:?}, {}", file!(), line!(), path, e));
3433
let mut pkgbuild = String::new();
3534

3635
push_field(&mut pkgbuild, "pkgname", "tmp");
3736
push_field(&mut pkgbuild, "pkgver", "1");
3837
push_field(&mut pkgbuild, "pkgrel", "1");
39-
push_array(&mut pkgbuild, "arch", &srcinfo.pkg.arch);
38+
push_array(&mut pkgbuild, "arch", srcinfo.pkg.arch());
4039
push_arrays(&mut pkgbuild, "source", &srcinfo.base.source);
4140
push_arrays(&mut pkgbuild, "md5sums", &srcinfo.base.md5sums);
4241
push_arrays(&mut pkgbuild, "sha1sums", &srcinfo.base.sha1sums);

src/tar_check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use colored::*;
55
use indexmap::IndexSet;
66
use libflate::gzip::Decoder;
77
use log::debug;
8-
use ruzstd::StreamingDecoder;
8+
use ruzstd::decoding::StreamingDecoder;
99
use std::fs::File;
1010
use std::io::Read;
1111
use std::path::Path;

0 commit comments

Comments
 (0)