From 5145f93d8ada2d6ba2e7f05588623b15fecdcbe5 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Tue, 24 Jul 2018 22:48:37 -0700
Subject: [PATCH] Update Files-Excluded and d-ignore-removed-submodules.patch
 for new upstream version 1.28.0-beta

---
 debian/copyright                                 | 13 ++-----------
 debian/patches/d-ignore-removed-submodules.patch | 11 ++++-------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 283de5afb4..c93919a6bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,8 +38,6 @@ Files-Excluded:
  src/vendor/assert_cli
  src/vendor/bitflags-0.7.0
  src/vendor/bufstream
- src/vendor/bytecount
- src/vendor/cargo_metadata-0.3.3
  src/vendor/clippy_lints
  src/vendor/colored
  src/vendor/commoncrypto
@@ -50,12 +48,9 @@ Files-Excluded:
  src/vendor/crypto-hash
  src/vendor/curl
  src/vendor/curl-sys
- src/vendor/difference-1.0.0
  src/vendor/endian-type
  src/vendor/enum_primitive
  src/vendor/environment
- src/vendor/failure
- src/vendor/failure_derive
  src/vendor/fnv
  src/vendor/foreign-types
  src/vendor/foreign-types-shared
@@ -68,6 +63,7 @@ Files-Excluded:
  src/vendor/hex
  src/vendor/home
  src/vendor/ignore
+ src/vendor/isatty
  src/vendor/json
  src/vendor/jsonrpc-core
  src/vendor/kernel32-sys
@@ -87,6 +83,7 @@ Files-Excluded:
  src/vendor/rls-blacklist
  src/vendor/rls-rustc
  src/vendor/rls-vfs
+ src/vendor/rustc-ap-arena
  src/vendor/rustc-ap-rustc_cratesio_shim
  src/vendor/rustc-ap-rustc_data_structures
  src/vendor/rustc-ap-rustc_errors
@@ -94,25 +91,19 @@ Files-Excluded:
  src/vendor/rustc-ap-serialize
  src/vendor/rustc-ap-syntax
  src/vendor/rustc-ap-syntax_pos
- src/vendor/same-file-0.1.3
  src/vendor/schannel
- src/vendor/semver-0.8.0
  src/vendor/serde_ignored
  src/vendor/shell-escape
- src/vendor/skeptic
- src/vendor/synstructure
  src/vendor/syntex_errors
  src/vendor/syntex_pos
  src/vendor/syntex_syntax
  src/vendor/term-0.4.6
  src/vendor/term
- src/vendor/toml-0.2.1
  src/vendor/unicode-segmentation
  src/vendor/unicode-xid-0.0.3
  src/vendor/url_serde
  src/vendor/userenv-sys
  src/vendor/vcpkg
- src/vendor/walkdir-1.0.7
  src/vendor/winapi-0.2.8
  src/vendor/winapi-build
 # DO NOT EDIT above, AUTOGENERATED
diff --git a/debian/patches/d-ignore-removed-submodules.patch b/debian/patches/d-ignore-removed-submodules.patch
index a8bb21423a..3523a8efc1 100644
--- a/debian/patches/d-ignore-removed-submodules.patch
+++ b/debian/patches/d-ignore-removed-submodules.patch
@@ -30,8 +30,8 @@ Forwarded: not-needed
 -  "tools/rls/test_data/workspace_symbol",
  ]
  
- # These options are controlled from our rustc wrapper script, so turn them off
-@@ -59,19 +40,3 @@
+ # Curiously, libtest will segfault if compiled with opt-level=3
+@@ -59,16 +40,3 @@
  debug = false
  debug-assertions = false
  
@@ -43,14 +43,11 @@ Forwarded: not-needed
 -[patch."https://github.com/rust-lang/cargo"]
 -cargo = { path = "tools/cargo" }
 -
--[patch.crates-io]
+-[patch."https://github.com/rust-lang-nursery/rustfmt"]
 -# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
 -# that we're shipping as well (to ensure that the rustfmt in RLS and the
--# `rustfmt` executable are the same exact vesion). Unlike Cargo, however, the
--# RLS depends on `rustfmt` from crates.io, so we put this in a `[patch]` section
--# for crates.io
+-# `rustfmt` executable are the same exact vesion).
 -rustfmt-nightly = { path = "tools/rustfmt" }
--clippy_lints = { path = "tools/clippy/clippy_lints" }
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
 @@ -618,10 +618,6 @@