drop patch only valid for 1.40.0

diff --git a/debian/patches/u-compiletest-stage0-bump.patch b/debian/patches/u-compiletest-stage0-bump.patch
deleted file mode 100644 (file)
index 86976d4..0000000
--- a/debian/patches/u-compiletest-stage0-bump.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit f6832adadb84364ce0c81fa02910b3706f441abc
-Author: Mark Rousskov <mark.simulacrum@gmail.com>
-Date:   Wed Nov 6 15:17:02 2019 -0500
-
-    Compiletest bump to stage0 bootstrap libtest
-
-diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
-index 34435819a2c..b115539b4af 100644
---- a/src/tools/compiletest/src/main.rs
-+++ b/src/tools/compiletest/src/main.rs
-@@ -568,6 +568,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
-         skip: vec![],
-         list: false,
-         options: test::Options::new(),
-+        time_options: None,
-     }
- }
- 
-@@ -703,6 +704,7 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> Vec<test::TestDescAn
-                     ignore,
-                     should_panic,
-                     allow_fail: false,
-+                    test_type: test::TestType::Unknown,
-                 },
-                 testfn: make_test_closure(config, early_props.ignore, testpaths, revision),
-             }

diff --git a/debian/rules b/debian/rules
index 058cc454807b6f1617d01032d5e2cf88f561967d..8ef897e6bf9869cb31ffcc8a3ce321936f985451 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -188,12 +188,6 @@ debian/dh_auto_configure.stamp: debian/config.toml
        if test $$(grep "127.0.0.1\s*localhost" /etc/hosts | wc -l) -gt 1; then \
          debian/ensure-patch -N debian/patches/d-host-duplicates.patch; fi
        # work around https://github.com/rust-lang/rust/issues/59264
-       # TODO: remove this in 1.41 and later
-       if dpkg --compare-versions $(LOCAL_RUST_VERSION) '>=' 1.40.0; then \
-        debian/ensure-patch -N debian/patches/u-compiletest-stage0-bump.patch; \
-       else \
-        debian/ensure-patch -R debian/patches/u-compiletest-stage0-bump.patch; \
-       fi
        # We patched some crates so have to rm the checksums
        find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" +
        # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16