Refresh patch 1001 with new upstream release.

diff --git a/debian/patches/1001_PR5012.patch b/debian/patches/1001_PR5012.patch
index fc3bd7e1eab1ac0c208b46281ad8f0da218b1853..7a3af3e811043a58a329a5793beddd8914690dac 100644 (file)
--- a/debian/patches/1001_PR5012.patch
+++ b/debian/patches/1001_PR5012.patch
@@ -18,18 +18,18 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
                                      &options.flag_exclude,
 --- a/src/cargo/core/features.rs
 +++ b/src/cargo/core/features.rs
-@@ -232,6 +232,7 @@
- pub struct CliUnstable {
-     pub print_im_a_teapot: bool,
+@@ -272,6 +272,7 @@
      pub unstable_options: bool,
+     pub offline: bool,
+     pub no_index_update: bool,
 +    pub avoid_dev_deps: bool,
  }
  
  impl CliUnstable {
-@@ -262,6 +263,7 @@
-         match k {
-             "print-im-a-teapot" => self.print_im_a_teapot = parse_bool(v)?,
+@@ -304,6 +305,7 @@
              "unstable-options" => self.unstable_options = true,
+             "offline" => self.offline = true,
+             "no-index-update" => self.no_index_update = true,
 +            "avoid-dev-deps" => self.avoid_dev_deps = true,
              _ => bail!("unknown `-Z` flag specified: {}", k),
          }
@@ -64,7 +64,7 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
  // Information about the dependencies for a crate, a tuple of:
  //
  // (dependency info, candidates, features activated)
-@@ -731,6 +743,7 @@
+@@ -711,6 +723,7 @@
          let method = Method::Required {
              dev_deps: false,
              features: &features,
@@ -72,7 +72,7 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
              uses_default_features: dep.uses_default_features(),
          };
          trace!("{}[{}]>{} trying {}", parent.name(), cur, dep.name(),
-@@ -996,7 +1009,8 @@
+@@ -1000,7 +1013,8 @@
                                    -> CargoResult<Requirements<'a>> {
      let mut reqs = Requirements::new(s);
      match *method {
@@ -82,7 +82,7 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
              for key in s.features().keys() {
                  reqs.require_feature(key)?;
              }
-@@ -1042,10 +1056,11 @@
+@@ -1046,10 +1060,11 @@
          }
          debug!("checking if {} is already activated", summary.package_id());
          let (features, use_default) = match *method {
@@ -238,7 +238,7 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
      let mut registry = PackageRegistry::new(ws.config())?;
      if let Some(source) = source {
          registry.add_preloaded(source);
-@@ -66,16 +78,6 @@
+@@ -68,16 +80,6 @@
          None
      };
  
@@ -253,9 +253,9 @@ Applied-Upstream: https://github.com/rust-lang/cargo/pull/5186
 -    };
 -
      let resolved_with_overrides =
-     ops::resolve_with_previous(&mut registry, ws,
-                                method, resolve.as_ref(), None,
-@@ -219,6 +221,7 @@
+     ops::resolve_with_previous(&mut registry,
+                                ws,
+@@ -236,6 +238,7 @@
                  let base = Method::Required {
                      dev_deps: dev_deps,
                      features: &[],