Skip to content

Commit 3e37922

Browse files
authored
Bump ureq, get redirect history. (#16078)
1 parent 1274d1f commit 3e37922

File tree

21 files changed

+663
-538
lines changed

21 files changed

+663
-538
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ fancy-regex = "0.14"
9393
filesize = "0.2"
9494
filetime = "0.2"
9595
heck = "0.5.0"
96+
http = "1.3.1"
9697
human-date-parser = "0.3.0"
9798
indexmap = "2.10"
9899
indicatif = "0.17"
@@ -150,7 +151,10 @@ rstest = { version = "0.23", default-features = false }
150151
rstest_reuse = "0.7"
151152
rusqlite = "0.31"
152153
rust-embed = "8.7.0"
153-
rustls = { version = "0.23", default-features = false, features = ["std", "tls12"] }
154+
# We have to fix rustls and ureq versions
155+
# because we use unversioned api to allow users set up their own
156+
# crypto providers (grep for "unversioned")
157+
rustls = { version = "=0.23.28", default-features = false, features = ["std", "tls12"] }
154158
rustls-native-certs = "0.8"
155159
scopeguard = { version = "1.2.0" }
156160
serde = { version = "1.0" }
@@ -173,7 +177,7 @@ update-informer = { version = "1.3.0", default-features = false, features = ["gi
173177
umask = "2.1"
174178
unicode-segmentation = "1.12"
175179
unicode-width = "0.2"
176-
ureq = { version = "2.12", default-features = false, features = ["socks-proxy"] }
180+
ureq = { version = "=3.0.12", default-features = false, features = ["socks-proxy"] }
177181
url = "2.2"
178182
uu_cp = "0.0.30"
179183
uu_mkdir = "0.0.30"

crates/nu-cli/src/completions/completer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ impl NuCompleter {
753753
Ok(value) => {
754754
log::error!(
755755
"External completer returned invalid value of type {}",
756-
value.get_type().to_string()
756+
value.get_type()
757757
);
758758
Some(vec![])
759759
}

crates/nu-cli/src/completions/custom_completions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl<T: Completer> Completer for CustomCompletion<T> {
140140
_ => {
141141
log::error!(
142142
"Custom completer returned invalid value of type {}",
143-
value.get_type().to_string()
143+
value.get_type()
144144
);
145145
return vec![];
146146
}

crates/nu-command/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ encoding_rs = { workspace = true }
6161
fancy-regex = { workspace = true }
6262
filesize = { workspace = true }
6363
filetime = { workspace = true }
64+
http = {workspace = true}
6465
human-date-parser = { workspace = true }
6566
indexmap = { workspace = true }
6667
indicatif = { workspace = true }
@@ -192,6 +193,7 @@ os = [
192193
"uu_uname",
193194
"uu_whoami",
194195
"which",
196+
"ureq/platform-verifier"
195197
]
196198

197199
# The dependencies listed below need 'getrandom'.
@@ -220,7 +222,7 @@ rustls-tls = [
220222
"dep:rustls-native-certs",
221223
"dep:webpki-roots",
222224
"update-informer/rustls-tls",
223-
"ureq/tls", # ureq 3 will has the feature rustls instead
225+
"ureq/rustls",
224226
]
225227

226228
plugin = ["nu-parser/plugin", "os"]

0 commit comments

Comments
 (0)