Skip to content

Commit ec2d2af

Browse files
authored
chore: bump crates (#1902)
1 parent 80d9e81 commit ec2d2af

File tree

8 files changed

+139
-253
lines changed

8 files changed

+139
-253
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ clap = { version = "4.5.38", features = ["derive", "color", "suggestions", "erro
5757
clap-verbosity-flag = "3.0.3"
5858
cmake = "0.1.54"
5959
console = { version = "0.16.0", features = ["windows-console-colors"] }
60-
criterion = "0.7"
60+
criterion = "0.8"
6161
dashmap = "6.1.0"
6262
difference = "2.0.0"
6363
digest = "0.10.7"
@@ -81,13 +81,13 @@ aws-smithy-http-client = { version = "1.1.2", default-features = false }
8181
aws-credential-types = { version = "1.2.10", default-features = false }
8282
hex = "0.4.3"
8383
hex-literal = "1.0.0"
84-
http = "1.3"
84+
http = "1.4"
8585
http-cache-semantics = "2.1.0"
8686
humansize = "2.1.3"
8787
humantime = "2.2.0"
88-
indexmap = "2.10.0"
88+
indexmap = "2.12.0"
8989
indicatif = "0.18.0"
90-
insta = { version = "1.43.1" }
90+
insta = { version = "1.44.3" }
9191
itertools = "0.14.0"
9292
json-patch = "4.0.0"
9393
keyring = "3.6.2"
@@ -121,13 +121,13 @@ reflink-copy = "0.1.26"
121121
regex = "1.11.1"
122122
reqwest = { version = "0.12.15", default-features = false }
123123
reqwest-middleware = "0.4.2"
124-
reqwest-retry = "0.7.0"
124+
reqwest-retry = "0.8.0"
125125
resolvo = { version = "0.10.0" }
126126
# hold back at 0.4.0 until `reqwest-retry` is updated
127-
retry-policies = { version = "0.4.0", default-features = false }
127+
retry-policies = { version = "0.5.0", default-features = false }
128128
rmp = { version = "0.8.14" }
129129
rmp-serde = { version = "1.3.0" }
130-
rstest = { version = "0.25.0" }
130+
rstest = { version = "0.26.1" }
131131
rstest_reuse = "0.7.0"
132132
simd-json = { version = "0.17.0", features = ["serde_impl"] }
133133
self_cell = "1.2.0"
@@ -136,7 +136,7 @@ serde_bytes = { version = "0.11.19" }
136136
serde_json = { version = "1.0.140" }
137137
serde_repr = "0.1"
138138
serde-value = "0.7.0"
139-
serde_with = "3.12.0"
139+
serde_with = "3.16.1"
140140
serde_yaml = "0.9.34"
141141
serde-untagged = "0.1.7"
142142
sha2 = "0.10.9"
@@ -151,10 +151,9 @@ smallvec = { version = "1.15.0", features = [
151151
strum = { version = "0.27.1", features = ["derive"] }
152152
superslice = "1.0.0"
153153
syn = "2.0.101"
154-
sysinfo = "0.36.0"
154+
sysinfo = "0.37.2"
155155
tar = "0.4.44"
156156
astral-tokio-tar = "0.5.3"
157-
tempdir = "0.3.7"
158157
tempfile = "3.20.0"
159158
temp-env = { version = "0.3.6", features = ["async_closure"] }
160159
test-log = "0.2.17"
@@ -169,14 +168,14 @@ tracing = "0.1.41"
169168
tracing-subscriber = { version = "0.3.19", default-features = false }
170169
tracing-test = { version = "0.2.5" }
171170
trybuild = { version = "1.0.105" }
172-
typed-path = { version = "0.11.0" }
171+
typed-path = { version = "0.12.0" }
173172
url = { version = "2.5.4" }
174173
unicode-normalization = "0.1.24"
175174
uuid = { version = "1.17.0", default-features = false }
176175
walkdir = "2.5.0"
177176
wasmtimer = "0.4.1"
178177
which = "8.0.0"
179-
windows-sys = { version = "0.60.2", default-features = false }
178+
windows-sys = { version = "0.61.2", default-features = false }
180179
winver = { version = "1.0.0" }
181180
zip = { version = "6.0.0", default-features = false }
182181
zstd = { version = "0.13.3", default-features = false }

crates/rattler_conda_types/src/channel/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,9 @@ mod tests {
514514
#[test]
515515
fn test_absolute_path() {
516516
let current_dir = std::env::current_dir().expect("no current dir?");
517-
let native_current_dir = typed_path::utils::utf8_current_dir()
518-
.expect("")
519-
.to_typed_path_buf();
517+
let native_current_dir =
518+
Utf8TypedPath::derive(typed_path::utils::utf8_current_dir().expect("").as_str())
519+
.to_path_buf();
520520
assert_eq!(
521521
absolute_path(".", &current_dir).as_ref(),
522522
Ok(&native_current_dir)

crates/rattler_shell/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ tracing = { workspace = true }
2727

2828
[dev-dependencies]
2929
insta = { workspace = true, features = ["yaml"] }
30-
tempdir = { workspace = true }
3130
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

crates/rattler_shell/src/activation.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ impl<T: Shell + Clone> Activator<T> {
693693
mod tests {
694694
use std::{collections::BTreeMap, str::FromStr};
695695

696-
use tempdir::TempDir;
696+
use tempfile::TempDir;
697697

698698
use super::*;
699699
#[cfg(unix)]
@@ -703,7 +703,7 @@ mod tests {
703703
#[test]
704704
#[cfg(unix)]
705705
fn test_post_activation_env_vars_applied_after_scripts_bash() {
706-
let temp_dir = TempDir::new("test_post_activation_env_vars").unwrap();
706+
let temp_dir = TempDir::with_prefix("test_post_activation_env_vars").unwrap();
707707

708708
// Create a dummy activation script so the activator will run it
709709
let activate_dir = temp_dir.path().join("etc/conda/activate.d");
@@ -772,7 +772,7 @@ mod tests {
772772

773773
#[test]
774774
fn test_collect_scripts() {
775-
let tdir = TempDir::new("test").unwrap();
775+
let tdir = TempDir::with_prefix("test").unwrap();
776776

777777
let path = tdir.path().join("etc/conda/activate.d/");
778778
fs::create_dir_all(&path).unwrap();
@@ -802,7 +802,7 @@ mod tests {
802802

803803
#[test]
804804
fn test_collect_env_vars() {
805-
let tdir = TempDir::new("test").unwrap();
805+
let tdir = TempDir::with_prefix("test").unwrap();
806806
let path = tdir.path().join("conda-meta/state");
807807
fs::create_dir_all(path.parent().unwrap()).unwrap();
808808

@@ -819,7 +819,7 @@ mod tests {
819819

820820
#[test]
821821
fn test_collect_env_vars_with_directory() {
822-
let tdir = TempDir::new("test").unwrap();
822+
let tdir = TempDir::with_prefix("test").unwrap();
823823
let state_path = tdir.path().join("conda-meta/state");
824824
fs::create_dir_all(state_path.parent().unwrap()).unwrap();
825825

@@ -869,7 +869,7 @@ mod tests {
869869

870870
#[cfg(unix)]
871871
fn create_temp_dir() -> TempDir {
872-
let tempdir = TempDir::new("test").unwrap();
872+
let tempdir = TempDir::with_prefix("test").unwrap();
873873
let path = tempdir.path().join("etc/conda/activate.d/");
874874
fs::create_dir_all(&path).unwrap();
875875

@@ -1091,7 +1091,7 @@ mod tests {
10911091

10921092
#[test]
10931093
fn test_deactivation() {
1094-
let tmp_dir = TempDir::new("test_deactivation").unwrap();
1094+
let tmp_dir = TempDir::with_prefix("test_deactivation").unwrap();
10951095
let tmp_dir_path = tmp_dir.path();
10961096

10971097
// Create an activator with some test environment variables
@@ -1148,7 +1148,7 @@ mod tests {
11481148

11491149
#[test]
11501150
fn test_deactivation_when_activated() {
1151-
let tmp_dir = TempDir::new("test_deactivation").unwrap();
1151+
let tmp_dir = TempDir::with_prefix("test_deactivation").unwrap();
11521152
let tmp_dir_path = tmp_dir.path();
11531153

11541154
// Create an activator with some test environment variables
@@ -1214,7 +1214,7 @@ mod tests {
12141214

12151215
#[test]
12161216
fn test_nested_deactivation() {
1217-
let tmp_dir = TempDir::new("test_deactivation").unwrap();
1217+
let tmp_dir = TempDir::with_prefix("test_deactivation").unwrap();
12181218
let tmp_dir_path = tmp_dir.path();
12191219

12201220
// Create an activator with some test environment variables
@@ -1333,7 +1333,7 @@ mod tests {
13331333

13341334
#[test]
13351335
fn test_resetting_conda_shlvl() {
1336-
let tmp_dir = TempDir::new("test_deactivation").unwrap();
1336+
let tmp_dir = TempDir::with_prefix("test_deactivation").unwrap();
13371337
let tmp_dir_path = tmp_dir.path();
13381338

13391339
// Create an activator with some test environment variables

crates/tools/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ anyhow = { workspace = true }
1414
bindgen = { workspace = true }
1515
clap = { workspace = true, features = ["derive"] }
1616
difference = { workspace = true }
17-
tempdir = { workspace = true }
1817
url = { workspace = true }
1918
fslock = { workspace = true }
2019
dirs = { workspace = true }

crates/tools/src/libsolv_bindings.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{project_root, reformat, update, Mode};
22
use std::borrow::Cow;
3-
use tempdir::TempDir;
3+
use tempfile::TempDir;
44

55
const ALLOWED_FUNC_PREFIX: &[&str] = &[
66
"map",
@@ -86,7 +86,7 @@ pub fn generate(mode: Mode) -> anyhow::Result<()> {
8686
//
8787
// The behavior of this file might change when we update libsolv so its important to check this
8888
// with every upgrade.
89-
let temp_include_dir = TempDir::new("libsolv")?;
89+
let temp_include_dir = TempDir::with_prefix("libsolv")?;
9090
std::fs::write(
9191
temp_include_dir.path().join("solvversion.h"),
9292
r#"#ifndef LIBSOLV_SOLVVERSION_H

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build = "cargo build"
2121
check = "cargo check"
2222
# libsolv compilation cannot find pixi's clang for some reason
2323
# so we skip that test for now
24-
test = "cargo nextest run --workspace --no-default-features --features=indicatif,tokio,serde,reqwest,sparse,gateway,resolvo,libsolv_c,s3,experimental_extras,edit,rattler_config,cli-tools -E 'not test(libsolv_bindings_up_to_date)' --no-fail-fast"
24+
test = "cargo nextest run --workspace --no-default-features --features=indicatif,tokio,serde,reqwest,sparse,gateway,resolvo,libsolv_c,s3,edit,rattler_config,cli-tools -E 'not test(libsolv_bindings_up_to_date)' --no-fail-fast"
2525
rattler = "cargo run --bin rattler --release --"
2626
doc = "RUSTDOCFLAGS='-Dwarnings -Wunreachable-pub' cargo doc --no-deps --all --all-features"
2727

0 commit comments

Comments
 (0)