Update cargo

diff --git a/src/cargo/debian/changelog b/src/cargo/debian/changelog
index f5be7fa1f8909b73830abade1e3f502a36e0f8d9..aa2e79a2c4ad8f5414c4071bfc0cbec4a45f75f4 100644 (file)
--- a/src/cargo/debian/changelog
+++ b/src/cargo/debian/changelog
@@ -1,8 +1,8 @@
-rust-cargo (0.38.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-cargo (0.40.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package cargo 0.38.0 from crates.io using debcargo 2.4.0
+  * Package cargo 0.40.0 from crates.io using debcargo 2.4.0
 
- -- Ximin Luo <infinity0@debian.org>  Fri, 16 Aug 2019 18:53:49 -0700
+ -- Ximin Luo <infinity0@debian.org>  Thu, 28 Nov 2019 00:31:27 +0000
 
 rust-cargo (0.37.0-1) unstable; urgency=medium
 

diff --git a/src/cargo/debian/patches/disable-pretty-env-logger.patch b/src/cargo/debian/patches/disable-pretty-env-logger.patch
index 2d442d78cb0730d6e9a8214d43dbf3a0176a3864..ed9c0cafe7533ce1a594efe4f0d26a4414808ab6 100644 (file)
--- a/src/cargo/debian/patches/disable-pretty-env-logger.patch
+++ b/src/cargo/debian/patches/disable-pretty-env-logger.patch
@@ -1,25 +1,13 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -125,10 +125,6 @@
- [dependencies.percent-encoding]
- version = "2.0"
- 
+@@ -125,4 +125,0 @@
 -[dependencies.pretty_env_logger]
 -version = "0.3"
 -optional = true
 -
- [dependencies.rustc-workspace-hack]
- version = "1.0.0"
- 
-@@ -188,7 +184,7 @@
- 
- [features]
- deny-warnings = []
+@@ -188,1 +184,1 @@
 -pretty-env-logger = ["pretty_env_logger"]
 +pretty-env-logger = []
- vendored-openssl = ["openssl"]
- [target."cfg(target_os = \"macos\")".dependencies.core-foundation]
- version = "0.6.0"
 --- a/src/bin/cargo/main.rs
 +++ b/src/bin/cargo/main.rs
 @@ -19,9 +19,6 @@

diff --git a/src/cargo/debian/patches/series b/src/cargo/debian/patches/series
index bbab645db38a78615f1c841a3efc190c3cffa1a8..9e50271e99a8a5c3716d037bc35338a0cc89ea90 100644 (file)
--- a/src/cargo/debian/patches/series
+++ b/src/cargo/debian/patches/series
@@ -1,3 +1,2 @@
-upgrade-to-url-2.patch
 disable-vendor.patch
 disable-pretty-env-logger.patch

diff --git a/src/cargo/debian/patches/upgrade-to-url-2.patch b/src/cargo/debian/patches/upgrade-to-url-2.patch
deleted file mode 100644 (file)
index 5edb2a4..0000000
--- a/src/cargo/debian/patches/upgrade-to-url-2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -125,6 +125,9 @@
- version = "0.10.11"
- optional = true
- 
-+[dependencies.percent-encoding]
-+version = "2.0"
-+
- [dependencies.pretty_env_logger]
- version = "0.3"
- optional = true
-@@ -173,10 +176,8 @@
- version = "0.1.5"
- 
- [dependencies.url]
--version = "1.1"
--
--[dependencies.url_serde]
--version = "0.2.0"
-+version = "2"
-+features = ["serde"]
- 
- [dependencies.walkdir]
- version = "2.2"
---- a/src/cargo/core/dependency.rs
-+++ b/src/cargo/core/dependency.rs
-@@ -69,7 +69,6 @@
-     target: Option<&'a Platform>,
-     /// The registry URL this dependency is from.
-     /// If None, then it comes from the default registry (crates.io).
--    #[serde(with = "url_serde")]
-     registry: Option<Url>,
- }
- 
---- a/src/cargo/ops/registry.rs
-+++ b/src/cargo/ops/registry.rs
-@@ -10,7 +10,7 @@
- use curl::easy::{Easy, InfoType, SslOpt};
- use failure::{bail, format_err};
- use log::{log, Level};
--use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET};
-+use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
- 
- use crate::core::dependency::Kind;
- use crate::core::manifest::ManifestMetadata;
-@@ -768,7 +768,7 @@
-         let extra = if source_id.is_default_registry() {
-             format!(
-                 " (go to https://crates.io/search?q={} to see more)",
--                percent_encode(query.as_bytes(), QUERY_ENCODE_SET)
-+                percent_encode(query.as_bytes(), NON_ALPHANUMERIC)
-             )
-         } else {
-             String::new()