Skip to content

Commit b6c7fbe

Browse files
committed
Auto merge of #11750 - klensy:pe, r=arlosi
reuse url encoding from `url` crate, don't use separate `percent-encoding` Reuse encoding from `url`, don't use separate `percent-encoding`.
2 parents 7b98113 + 37d429c commit b6c7fbe

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ openssl = { version = '0.10.11', optional = true }
5555
os_info = "3.5.0"
5656
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
5757
pathdiff = "0.2"
58-
percent-encoding = "2.0"
5958
pretty_env_logger = { version = "0.4", optional = true }
6059
rustfix = "0.6.0"
6160
semver = { version = "1.0.3", features = ["serde"] }

src/cargo/ops/registry.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ use curl::easy::{Easy, InfoType, SslOpt, SslVersion};
1515
use log::{log, Level};
1616
use pasetors::keys::{AsymmetricKeyPair, Generate};
1717
use pasetors::paserk::FormatAsPaserk;
18-
use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
1918
use termcolor::Color::Green;
2019
use termcolor::ColorSpec;
20+
use url::Url;
2121

2222
use crate::core::dependency::DepKind;
2323
use crate::core::dependency::Dependency;
@@ -1206,10 +1206,8 @@ pub fn search(
12061206
);
12071207
} else if total_crates > limit && limit >= search_max_limit {
12081208
let extra = if source_ids.original.is_crates_io() {
1209-
format!(
1210-
" (go to https://crates.io/search?q={} to see more)",
1211-
percent_encode(query.as_bytes(), NON_ALPHANUMERIC)
1212-
)
1209+
let url = Url::parse_with_params("https://crates.io/search", &[("q", query)])?;
1210+
format!(" (go to {url} to see more)")
12131211
} else {
12141212
String::new()
12151213
};

0 commit comments

Comments
 (0)