Commit 4f64c6d5ba2fc5ac9de3809b71189186671ed939 - rust-bzip2

+1

-0

src/cargo/debian/changelog less more

0	0	rust-cargo (0.37.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1	1
2	2	* Package cargo 0.37.0 from crates.io using debcargo 2.4.0
	3	* Upgrade to url 2.
3	4
4	5	-- Ximin Luo <infinity0@debian.org> Tue, 16 Jul 2019 23:20:25 -0700
5	6

+1

-0

src/cargo/debian/patches/series less more

	0	upgrade-to-url-2.patch
0	1	disable-vendor.patch
1	2	disable-pretty-env-logger.patch
2	3	relax-deps.diff

+55

-0

src/cargo/debian/patches/upgrade-to-url-2.patch less more

	0	--- a/Cargo.toml
	1	+++ b/Cargo.toml
	2	@@ -125,6 +125,9 @@
	3	version = "0.10.11"
	4	optional = true
	5
	6	+[dependencies.percent-encoding]
	7	+version = "2.0"
	8	+
	9	[dependencies.pretty_env_logger]
	10	version = "0.3"
	11	optional = true
	12	@@ -173,10 +176,8 @@
	13	version = "0.1.5"
	14
	15	[dependencies.url]
	16	-version = "1.1"
	17	-
	18	-[dependencies.url_serde]
	19	-version = "0.2.0"
	20	+version = "2"
	21	+features = ["serde"]
	22
	23	[dependencies.walkdir]
	24	version = "2.2"
	25	--- a/src/cargo/core/dependency.rs
	26	+++ b/src/cargo/core/dependency.rs
	27	@@ -69,7 +69,6 @@
	28	target: Option<&'a Platform>,
	29	/// The registry URL this dependency is from.
	30	/// If None, then it comes from the default registry (crates.io).
	31	- #[serde(with = "url_serde")]
	32	registry: Option<Url>,
	33	}
	34
	35	--- a/src/cargo/ops/registry.rs
	36	+++ b/src/cargo/ops/registry.rs
	37	@@ -10,7 +10,7 @@
	38	use curl::easy::{Easy, InfoType, SslOpt};
	39	use failure::{bail, format_err};
	40	use log::{log, Level};
	41	-use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET};
	42	+use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
	43
	44	use crate::core::dependency::Kind;
	45	use crate::core::manifest::ManifestMetadata;
	46	@@ -768,7 +768,7 @@
	47	let extra = if source_id.is_default_registry() {
	48	format!(
	49	" (go to https://crates.io/search?q={} to see more)",
	50	- percent_encode(query.as_bytes(), QUERY_ENCODE_SET)
	51	+ percent_encode(query.as_bytes(), NON_ALPHANUMERIC)
	52	)
	53	} else {
	54	String::new()

+7

-0

src/crates-io/debian/changelog less more

	0	rust-crates-io (0.25.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
	1
	2	* Package crates-io 0.25.0 from crates.io using debcargo 2.4.0
	3	* Upgrade to url 2.
	4
	5	-- Ximin Luo <infinity0@debian.org> Thu, 15 Aug 2019 18:41:53 -0700
	6
0	7	rust-crates-io (0.25.0-1) unstable; urgency=medium
1	8
2	9	* Package crates-io 0.25.0 from crates.io using debcargo 2.4.0

+1

-0

src/crates-io/debian/patches/series less more

upgrade-to-url-2.patch

+40

-0

src/crates-io/debian/patches/upgrade-to-url-2.patch less more

	0	--- a/Cargo.toml
	1	+++ b/Cargo.toml
	2	@@ -31,6 +31,9 @@
	3	[dependencies.http]
	4	version = "0.1"
	5
	6	+[dependencies.percent-encoding]
	7	+version = "2.0"
	8	+
	9	[dependencies.serde]
	10	version = "1.0"
	11	features = ["derive"]
	12	@@ -42,4 +45,4 @@
	13	version = "1.0"
	14
	15	[dependencies.url]
	16	-version = "1.0"
	17	+version = "2.0"
	18	--- a/lib.rs
	19	+++ b/lib.rs
	20	@@ -10,9 +10,9 @@
	21	use curl::easy::{Easy, List};
	22	use failure::bail;
	23	use http::status::StatusCode;
	24	+use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
	25	use serde::{Deserialize, Serialize};
	26	use serde_json;
	27	-use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET};
	28	use url::Url;
	29
	30	pub type Result<T> = std::result::Result<T, failure::Error>;
	31	@@ -252,7 +252,7 @@
	32	}
	33
	34	pub fn search(&mut self, query: &str, limit: u32) -> Result<(Vec<Crate>, u32)> {
	35	- let formatted_query = percent_encode(query.as_bytes(), QUERY_ENCODE_SET);
	36	+ let formatted_query = percent_encode(query.as_bytes(), NON_ALPHANUMERIC);
	37	let body = self.req(
	38	&format!("/crates?q={}&per_page={}", formatted_query, limit),
	39	None,