Update configs and prune script for 1.32.0 beta

diff --git a/debian/check-orig-suspicious.sh b/debian/check-orig-suspicious.sh
index 146acac0cb9b2410245e65bf03b3cece416b588f..ed0d5b484d9817b9ba3c489905a6e47aa455a54f 100755 (executable)
--- a/debian/check-orig-suspicious.sh
+++ b/debian/check-orig-suspicious.sh
@@ -26,7 +26,7 @@ find . -type f -and -not -name '.cargo-checksum.json' -exec file '{}' \; | \
   grep -v '\b\(text\|empty\)\b' || true
 
 # Most C and JS code should be in their own package
-find src/vendor/ -name '*.c' -o -name '*.js'
+find vendor/ -name '*.c' -o -name '*.js'
 
 echo "The above files (if any) seem suspicious, please audit them."
 echo "If good, add them to ${SUS_WHITELIST}."

diff --git a/debian/config.toml.in b/debian/config.toml.in
index 53e579f84508b3a127f84dafc2fbe35a7753c6b2..e9ea03c93cd9c40434641ac3e7bb7f3c5569fbaf 100644 (file)
--- a/debian/config.toml.in
+++ b/debian/config.toml.in
@@ -39,7 +39,7 @@ llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
 link-shared = true
 
 [rust]
-use-jemalloc = false
+jemalloc = false
 optimize = MAKE_OPTIMISATIONS
 dist-src = false
 

diff --git a/debian/copyright b/debian/copyright
index 148c81abd566f93d436308486a0b17553010d4a9..136ef508b158d1751737b5764bdb7a8286753463 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: rust
 Source: https://www.rust-lang.org
 Files-Excluded:
  *.min.js
- src/jemalloc
  src/llvm
  src/llvm-emscripten
- src/vendor/mdbook/src/theme/_FontAwesome
- src/vendor/mdbook/src/theme/highlight.js
- src/vendor/mdbook/src/theme/highlight.css
+ vendor/jemalloc-sys
+ vendor/mdbook/src/theme/_FontAwesome
+ vendor/mdbook/src/theme/highlight.js
+ vendor/mdbook/src/theme/highlight.css
 # Exclude submodules https://github.com/rust-lang/rust/tree/master/src/tools
 # We prefer to do them in different Debian packages so they can have their own
 # version numbers. If upstream merges them "properly" (i.e. unify the version
@@ -42,106 +42,115 @@ Files-Excluded:
  src/libcompiler_builtins/compiler-rt/unittests
  src/libcompiler_builtins/compiler-rt/www
 # Embedded C libraries
- src/vendor/backtrace-sys*/src/libbacktrace
- src/vendor/lzma-sys*/xz-*
+ vendor/backtrace-sys*/src/libbacktrace
+ vendor/lzma-sys*/xz-*
 # Embedded binary blobs
- src/vendor/winapi-*/*/*.a
- src/vendor/mdbook/src/theme/playpen_editor
+ vendor/winapi-*/*/*.a
+ vendor/mdbook/src/theme/playpen_editor
 # Accidental development files
- src/vendor/shlex/*.swp
- src/vendor/shlex/*/*.swp
+ vendor/shlex/*.swp
+ vendor/shlex/*/*.swp
 # Non-free-format documents already available in other formats
  src/doc/book/second-edition/nostarch/odt
 # unused dependencies, generated by debian/prune-unused-deps
 # DO NOT EDIT below, AUTOGENERATED
- src/vendor/assert_cli
- src/vendor/bit-set
- src/vendor/bit-vec
- src/vendor/bufstream
- src/vendor/bytecount
- src/vendor/bytesize
- src/vendor/cargo_metadata
- src/vendor/colored
- src/vendor/commoncrypto
- src/vendor/commoncrypto-sys
- src/vendor/compiletest_rs
- src/vendor/core-foundation
- src/vendor/core-foundation-sys
- src/vendor/crossbeam
- src/vendor/crossbeam-channel
- src/vendor/crossbeam-epoch
- src/vendor/crossbeam-utils
- src/vendor/crypto-hash
- src/vendor/curl
- src/vendor/curl-sys
- src/vendor/derive_more
- src/vendor/derive-new
- src/vendor/environment
- src/vendor/fnv
- src/vendor/foreign-types
- src/vendor/foreign-types-shared
- src/vendor/fs2
- src/vendor/fst
- src/vendor/futures
- src/vendor/fwdansi
- src/vendor/git2
- src/vendor/git2-curl
- src/vendor/glob
- src/vendor/globset
- src/vendor/hex
- src/vendor/home
- src/vendor/if_chain
- src/vendor/ignore
- src/vendor/json
- src/vendor/jsonrpc-core
- src/vendor/kernel32-sys
- src/vendor/languageserver-types
- src/vendor/lazycell
- src/vendor/libgit2-sys
- src/vendor/libnghttp2-sys
- src/vendor/libssh2-sys
- src/vendor/libz-sys
- src/vendor/log-0.3.9
- src/vendor/num-derive
- src/vendor/opener
- src/vendor/openssl
- src/vendor/openssl-probe
- src/vendor/openssl-src
- src/vendor/openssl-sys
- src/vendor/ordslice
- src/vendor/packed_simd
- src/vendor/proptest
- src/vendor/quine-mc_cluskey
- src/vendor/racer
- src/vendor/rls-analysis
- src/vendor/rls-blacklist
- src/vendor/rls-rustc
- src/vendor/rls-vfs
- src/vendor/rustc-ap-arena
- src/vendor/rustc-ap-graphviz
- src/vendor/rustc-ap-rustc_cratesio_shim
- src/vendor/rustc-ap-rustc_data_structures
- src/vendor/rustc-ap-rustc_errors
- src/vendor/rustc-ap-rustc_target
- src/vendor/rustc-ap-serialize
- src/vendor/rustc-ap-syntax
- src/vendor/rustc-ap-syntax_pos
- src/vendor/rustc_version
- src/vendor/rusty-fork
- src/vendor/schannel
- src/vendor/semver
- src/vendor/semver-parser
- src/vendor/serde_ignored
- src/vendor/shell-escape
- src/vendor/syn
- src/vendor/term
- src/vendor/unicode-segmentation
- src/vendor/url_serde
- src/vendor/vcpkg
- src/vendor/vergen
- src/vendor/wait-timeout
- src/vendor/winapi-0.2.8
- src/vendor/winapi-build
+ vendor/assert_cli
+ vendor/bit-set
+ vendor/bit-vec
+ vendor/bufstream
+ vendor/bytecount
+ vendor/bytesize
+ vendor/cargo_metadata
+ vendor/colored
+ vendor/commoncrypto
+ vendor/commoncrypto-sys
+ vendor/compiletest_rs
+ vendor/core-foundation
+ vendor/core-foundation-sys
+ vendor/crossbeam
+ vendor/crossbeam-channel
+ vendor/crossbeam-epoch
+ vendor/crossbeam-utils-0.5.0
+ vendor/crossbeam-utils
+ vendor/crypto-hash
+ vendor/curl
+ vendor/curl-sys
+ vendor/derive_more
+ vendor/derive-new
+ vendor/directories
+ vendor/ena-0.9.3
+ vendor/environment
+ vendor/env_logger
+ vendor/fnv
+ vendor/foreign-types
+ vendor/foreign-types-shared
+ vendor/fs2
+ vendor/fst
+ vendor/futures
+ vendor/fwdansi
+ vendor/git2
+ vendor/git2-curl
+ vendor/glob
+ vendor/globset
+ vendor/hex
+ vendor/home
+ vendor/if_chain
+ vendor/ignore
+ vendor/im-rc
+ vendor/json
+ vendor/jsonrpc-core
+ vendor/kernel32-sys
+ vendor/languageserver-types
+ vendor/lazycell
+ vendor/libgit2-sys
+ vendor/libnghttp2-sys
+ vendor/libssh2-sys
+ vendor/libz-sys
+ vendor/log-0.3.9
+ vendor/num-derive
+ vendor/opener
+ vendor/openssl
+ vendor/openssl-probe
+ vendor/openssl-src
+ vendor/openssl-sys
+ vendor/ordslice
+ vendor/packed_simd
+ vendor/parking_lot_core-0.2.14
+ vendor/pretty_env_logger
+ vendor/proptest
+ vendor/pulldown-cmark
+ vendor/quine-mc_cluskey
+ vendor/racer
+ vendor/rls-analysis
+ vendor/rls-blacklist
+ vendor/rls-rustc
+ vendor/rls-vfs
+ vendor/rustc-ap-arena
+ vendor/rustc-ap-graphviz
+ vendor/rustc-ap-rustc_cratesio_shim
+ vendor/rustc-ap-rustc_data_structures
+ vendor/rustc-ap-rustc_errors
+ vendor/rustc-ap-rustc_target
+ vendor/rustc-ap-serialize
+ vendor/rustc-ap-syntax
+ vendor/rustc-ap-syntax_pos
+ vendor/rustc_version
+ vendor/rusty-fork
+ vendor/schannel
+ vendor/semver
+ vendor/semver-parser
+ vendor/serde_ignored
+ vendor/shell-escape
+ vendor/syn
+ vendor/term
+ vendor/typenum
+ vendor/unicode-segmentation
+ vendor/url_serde
+ vendor/vcpkg
+ vendor/vergen
+ vendor/wait-timeout
+ vendor/winapi-0.2.8
+ vendor/winapi-build
 # DO NOT EDIT above, AUTOGENERATED
 
 Files: C*.md
@@ -224,24 +233,24 @@ Files: src/libstd/sync/mpsc/mpsc_queue.rs
 Copyright: 2010-2011 Dmitry Vyukov
 License: BSD-2-Clause
 
-Files: src/vendor/bitflags/*
-       src/vendor/bitflags-*
-       src/vendor/cc/*
-       src/vendor/cmake/*
-       src/vendor/env_logger/*
-       src/vendor/getopts/*
-       src/vendor/libc/*
-       src/vendor/log/*
-       src/vendor/rand/*
-       src/vendor/rand-0*/*
-       src/vendor/rand_core/*
-       src/vendor/regex/*
-       src/vendor/regex-0*/*
-       src/vendor/regex-syntax/*
-       src/vendor/regex-syntax-0*/*
-       src/vendor/rustc-hash/*
-       src/vendor/rustc-serialize/*
-       src/vendor/time/*
+Files: vendor/bitflags/*
+       vendor/bitflags-*
+       vendor/cc/*
+       vendor/cmake/*
+       vendor/env_logger/*
+       vendor/getopts/*
+       vendor/libc/*
+       vendor/log/*
+       vendor/rand/*
+       vendor/rand-0*/*
+       vendor/rand_core/*
+       vendor/regex/*
+       vendor/regex-0*/*
+       vendor/regex-syntax/*
+       vendor/regex-syntax-0*/*
+       vendor/rustc-hash/*
+       vendor/rustc-serialize/*
+       vendor/time/*
 Copyright: 2010-2018 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment:
@@ -250,17 +259,17 @@ Comment:
  same MIT/Apache-2.0 dual-license. See https://github.com/rust-lang.
  Exceptions are noted below.
 
-Files: src/vendor/num-integer/*
-       src/vendor/num-traits/*
+Files: vendor/num-integer/*
+       vendor/num-traits/*
 Copyright: 2014-2018 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/rust-num/num
 
 Files:
- src/vendor/string_cache/*
- src/vendor/string_cache_codegen/*
- src/vendor/string_cache_shared/*
- src/vendor/unicode-bidi/*
+ vendor/string_cache/*
+ vendor/string_cache_codegen/*
+ vendor/string_cache_shared/*
+ vendor/unicode-bidi/*
 Copyright: 2015-2017 Alex Crichton <alex@alexcrichton.com>
            2015-2017 Keegan McAllister <kmcallister@mozilla.com>
            2015-2017 Chris Morgan <me@chrismorgan.info>
@@ -271,43 +280,43 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/servo/
 
 Files: src/dlmalloc/*
-       src/vendor/backtrace/*
-       src/vendor/backtrace-sys/*
-       src/vendor/cfg-if/*
-       src/vendor/filetime/*
-       src/vendor/flate2/*
-       src/vendor/jobserver/*
-       src/vendor/lzma-sys/*
-       src/vendor/miow/*
-       src/vendor/miniz-sys/*
-       src/vendor/pkg-config/*
-       src/vendor/proc-macro2/*
-       src/vendor/proc-macro2-0*/*
-       src/vendor/rustc-demangle/*
-       src/vendor/scoped-tls/*
-       src/vendor/socket2/*
-       src/vendor/tar/*
-       src/vendor/toml/*
-       src/vendor/xz2/*
+       vendor/backtrace/*
+       vendor/backtrace-sys/*
+       vendor/cfg-if/*
+       vendor/filetime/*
+       vendor/flate2/*
+       vendor/jobserver/*
+       vendor/lzma-sys/*
+       vendor/miow/*
+       vendor/miniz-sys/*
+       vendor/pkg-config/*
+       vendor/proc-macro2/*
+       vendor/proc-macro2-0*/*
+       vendor/rustc-demangle/*
+       vendor/scoped-tls/*
+       vendor/socket2/*
+       vendor/tar/*
+       vendor/toml/*
+       vendor/xz2/*
 Copyright: 2014-2017 Alex Crichton <alex@alexcrichton.com>
            2015-2017 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/alexcrichton/
 
-Files: src/vendor/ammonia/*
+Files: vendor/ammonia/*
 Copyright: 2015-2018 Michael Howell <michael@notriddle.com>
 License: MIT  or  Apache-2.0
 Comment: see https://github.com/notriddle/ammonia
 
-Files: src/vendor/ansi_term/*
+Files: vendor/ansi_term/*
 Copyright: 2014-2016 ogham@bsago.me
            2014-2016 Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
 License: MIT
 Comment: see https://github.com/ogham/rust-ansi-term
 
-Files: src/vendor/aho-corasick/*
-       src/vendor/memchr/*
-       src/vendor/utf8-ranges/*
+Files: vendor/aho-corasick/*
+       vendor/memchr/*
+       vendor/utf8-ranges/*
 Copyright: 2015 Andrew Gallant <jamslam@gmail.com>
            2015-2018 bluss
 License: MIT or Unlicense
@@ -317,18 +326,18 @@ Comment: see upstream projects,
  * https://github.com/BurntSushi/rust-memchr
  * https://github.com/BurntSushi/utf8-ranges
 
-Files: src/vendor/atty/*
+Files: vendor/atty/*
 Copyright: 2015-2017 softprops <d.tangren@gmail.com>
 License: MIT
 Comment: see https://github.com/softprops/atty
 
 Files:
- src/vendor/byteorder/*
- src/vendor/same-file/*
- src/vendor/termcolor/*
- src/vendor/walkdir/*
- src/vendor/winapi-util/*
- src/vendor/wincolor/*
+ vendor/byteorder/*
+ vendor/same-file/*
+ vendor/termcolor/*
+ vendor/walkdir/*
+ vendor/winapi-util/*
+ vendor/wincolor/*
 Copyright: 2015-2018 Andrew Gallant <jamslam@gmail.com>
 License: Unlicense or MIT
 Comment:
@@ -339,42 +348,42 @@ Comment:
  see https://github.com/BurntSushi/ripgrep/tree/master/termcolor
  see https://github.com/BurntSushi/ripgrep/tree/master/wincolor
 
-Files: src/vendor/log_settings/*
+Files: vendor/log_settings/*
 Copyright: 2016-2018 Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
 License: MIT
 Comment: see https://github.com/oli-obk/log_settings
 
 Files:
- src/vendor/chalk-engine/*
- src/vendor/chalk-macros/*
+ vendor/chalk-engine/*
+ vendor/chalk-macros/*
 Copyright: 2015-2018 Rust Compiler Team
            2015-2018 Chalk developers
 License: Apache-2.0 or MIT
 Comment: see https://github.com/rust-lang-nursery/chalk
 
-Files: src/vendor/chrono/*
+Files: vendor/chrono/*
 Copyright: 2014-2018 Kang Seonghoon <public+rust@mearie.org>
 License: MIT or Apache-2.0
 Comment: see https://github.com/chronotope/chrono
 
-Files: src/vendor/clap/*
+Files: vendor/clap/*
 Copyright: 2015-2017 Kevin K. <kbknapp@gmail.com>
 License: MIT
 Comment: see https://github.com/kbknapp/clap-rs.git
 
-Files: src/vendor/cloudabi/*
+Files: vendor/cloudabi/*
 Copyright: 2016-2018 Nuxi (https://nuxi.nl/) and contributors
 License: BSD-2-Clause
 Comment: see https://github.com/nuxinl/cloudabi
 
-Files: src/vendor/crossbeam-deque/*
-       src/vendor/crossbeam-epoch-0*/*
-       src/vendor/crossbeam-utils-0*/*
+Files: vendor/crossbeam-deque/*
+       vendor/crossbeam-epoch-0*/*
+       vendor/crossbeam-utils-0*/*
 Copyright: 2017-2018 The Crossbeam Project Developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/crossbeam-rs/crossbeam-deque
 
-Files: src/vendor/datafrog/*
+Files: vendor/datafrog/*
 Copyright:
  2018 Frank McSherry <fmcsherry@me.com>
  2018 The Rust Project Developers
@@ -382,18 +391,18 @@ Copyright:
 License: Apache-2.0 or MIT
 Comment: see https://github.com/rust-lang-nursery/datafrog
 
-Files: src/vendor/diff/*
+Files: vendor/diff/*
 Copyright: 2015-2017 Utkarsh Kukreti <utkarshkukreti@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/utkarshkukreti/diff.rs
 
 Files:
- src/vendor/itoa/*
- src/vendor/quote/*
- src/vendor/quote-0*/*
- src/vendor/syn/*
- src/vendor/syn-0*/*
- src/vendor/synom/*
+ vendor/itoa/*
+ vendor/quote/*
+ vendor/quote-0*/*
+ vendor/syn/*
+ vendor/syn-0*/*
+ vendor/synom/*
 Copyright: 2016-2018 David Tolnay <dtolnay@gmail.com>
 License: MIT or Apache-2.0
 Comment:
@@ -402,14 +411,14 @@ Comment:
  see https://github.com/dtolnay/syn
  see https://github.com/dtolnay/synom
 
-Files: src/vendor/arrayvec/*
-       src/vendor/either/*
-       src/vendor/fixedbitset/*
-       src/vendor/itertools/*
-       src/vendor/maplit/*
-       src/vendor/nodrop/*
-       src/vendor/ordermap/*
-       src/vendor/scopeguard/*
+Files: vendor/arrayvec/*
+       vendor/either/*
+       vendor/fixedbitset/*
+       vendor/itertools/*
+       vendor/maplit/*
+       vendor/nodrop/*
+       vendor/ordermap/*
+       vendor/scopeguard/*
 Copyright: 2014-2018 bluss
 License: MIT or Apache-2.0
 Comment: see https://github.com/bluss/rust-itertools
@@ -420,24 +429,24 @@ Comment: see https://github.com/bluss/rust-itertools
          see https://github.com/bluss/ordermap
          see https://github.com/bluss/scopeguard
 
-Files: src/vendor/difference/*
+Files: vendor/difference/*
 Copyright: 2015-2018 Johann Hofmann <mail@johann-hofmann.com>
 License: MIT
 Comment: see https://github.com/johannhof/difference.rs
 
-Files: src/vendor/elasticlunr-rs/*
+Files: vendor/elasticlunr-rs/*
 Copyright: 2017-2018 Matt Ickstadt <mattico8@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/mattico/elasticlunr-rs
 
-Files: src/vendor/ena/*
+Files: vendor/ena/*
 Copyright: 2015-2018 Niko Matsakis <niko@alum.mit.edu>
 License: MIT or Apache-2.0
 Comment: see https://github.com/nikomatsakis/ena
 
 Files:
- src/vendor/error-chain/*
- src/vendor/error-chain-0*/*
+ vendor/error-chain/*
+ vendor/error-chain-0*/*
 Copyright: 2016-2017 Brian Anderson <banderson@mozilla.com>
            2016-2017 Paul Colomiets <paul@colomiets.name>
            2016-2017 Colin Kiegel <kiegel@gmx.de>
@@ -446,146 +455,146 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/brson/error-chain
 
 Files:
- src/vendor/failure/*
- src/vendor/failure_derive/*
+ vendor/failure/*
+ vendor/failure_derive/*
 Copyright: 2017-2018 Without Boats <boats@mozilla.com>
 License: MIT OR Apache-2.0
 Comment:
  see https://github.com/withoutboats/failure
  see https://github.com/withoutboats/failure_derive
 
-Files: src/vendor/fuchsia-zircon/*
-       src/vendor/fuchsia-zircon-sys/*
+Files: vendor/fuchsia-zircon/*
+       vendor/fuchsia-zircon-sys/*
 Copyright: 2014-2018 Raph Levien <raph@google.com>
 License: BSD-3-Clause
 Comment: see https://fuchsia.googlesource.com/garnet/
 
-Files: src/vendor/futf/*
+Files: vendor/futf/*
 Copyright: 2015-2018 Keegan McAllister <kmcallister@mozilla.com>
 License: MIT  or  Apache-2.0
 Comment: see https://github.com/servo/futf
 
-Files: src/vendor/handlebars/*
+Files: vendor/handlebars/*
 Copyright: 2014-2017 Ning Sun <sunng@about.me>
 License: MIT
 Comment: see https://github.com/sunng87/handlebars-rust
 
 Files:
- src/vendor/html5ever/*
- src/vendor/markup5ever/*
+ vendor/html5ever/*
+ vendor/markup5ever/*
 Copyright: 2014-2018 The html5ever Project Developers
 License: MIT  or  Apache-2.0
 Comment: see https://github.com/servo/html5ever
 
-Files: src/vendor/humantime/*
+Files: vendor/humantime/*
 Copyright: 2016-2018 Paul Colomiets <paul@colomiets.name>
 License: MIT or Apache-2.0
 Comment: see https://github.com/tailhook/humantime
 
-Files: src/vendor/idna/*
-       src/vendor/percent-encoding/*
-       src/vendor/url/*
+Files: vendor/idna/*
+       vendor/percent-encoding/*
+       vendor/url/*
 Copyright: 2013-2017 The rust-url developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/servo/rust-url/
 
-Files: src/vendor/is-match/*
-       src/vendor/toml-query/*
+Files: vendor/is-match/*
+       vendor/toml-query/*
 Copyright: 2017-2018 Matthias Beyer <mail@beyermatthias.de>
 License: MPL-2.0
 Comment: see https://github.com/matthiasbeyer/is-match
          see https://github.com/matthiasbeyer/toml-query
 
-Files: src/vendor/matches/*
+Files: vendor/matches/*
 Copyright: 2014-2017 Simon Sapin <simon.sapin@exyr.org>
 License: MIT
 Comment: see https://github.com/SimonSapin
 
 Files:
- src/vendor/lazy_static/*
- src/vendor/lazy_static-0*/*
- src/vendor/owning_ref/*
+ vendor/lazy_static/*
+ vendor/lazy_static-0*/*
+ vendor/owning_ref/*
 Copyright: 2014-2018 Marvin Löbel <loebel.marvin@gmail.com>
 License: MIT or Apache-2.0
 Comment:
  see https://github.com/rust-lang-nursery/lazy-static.rs
  see https://github.com/Kimundi/owning-ref-rs
 
-Files: src/vendor/mdbook/*
+Files: vendor/mdbook/*
 Copyright: 2015-2017 Mathieu David <mathieudavid@mathieudavid.org>
 License: MPL-2.0
 Comment: see https://github.com/azerupi/mdBook
 
-Files: src/vendor/memmap/*
+Files: vendor/memmap/*
 Copyright: 2015-2018 Dan Burkert <dan@danburkert.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/danburkert/memmap-rs
 
-Files: src/vendor/memoffset/*
+Files: vendor/memoffset/*
 Copyright: 2017-2018 Gilad Naaman <gilad.naaman@gmail.com>
 License: MIT
 Comment: see https://github.com/Gilnaa/memoffset
 
 Files:
- src/vendor/macro-utils/*
- src/vendor/minifier/*
+ vendor/macro-utils/*
+ vendor/minifier/*
 Copyright: 2017-2018 Guillaume Gomez <guillaume1.gomez@gmail.com>
 License: MIT
 Comment:
  see https://github.com/GuillaumeGomez/macro_utils
  see https://github.com/GuillaumeGomez/minifier-rs
 
-Files: src/vendor/miniz-sys/miniz.c
+Files: vendor/miniz-sys/miniz.c
 Copyright: 1996-2012 Rich Geldreich
 License: Unlicense
 
-Files: src/vendor/new_debug_unreachable/*
+Files: vendor/new_debug_unreachable/*
 Copyright: 2014-2018 Matt Brubeck <mbrubeck@limpet.net>
            2014-2018 Jonathan Reem <jonathan.reem@gmail.com>
 License: MIT
 Comment: see https://github.com/mbrubeck/rust-debug-unreachable
 
-Files: src/vendor/num_cpus/*
+Files: vendor/num_cpus/*
 Copyright: 2015 Sean McArthur <sean.monstar@gmail.com>
 License: MIT
 Comment: see https://github.com/seanmonstar/num_cpus
 
-Files: src/vendor/open/*
+Files: vendor/open/*
 Copyright: 2015-2017 Sebastian Thiel <byronimo@gmail.com>
 License: MIT
 Comment: see https://github.com/Byron/open-rs
 
 Files:
- src/vendor/pest/*
- src/vendor/pest_derive/*
+ vendor/pest/*
+ vendor/pest_derive/*
 Copyright: 2016-2018 Dragoș Tiselice <dragostiselice@gmail.com>
 License: MPL-2.0
 Comment:
  see https://github.com/dragostis/pest
  see https://github.com/pest-parser/pest
 
-Files: src/vendor/polonius-engine/*
+Files: vendor/polonius-engine/*
 Copyright: 2018-2018 The Rust Project Developers
            2018-2018 Polonius Developers
 License: Apache-2.0 or MIT
 Comment: see https://github.com/rust-lang-nursery/polonius
 
-Files: src/vendor/pulldown-cmark/*
+Files: vendor/pulldown-cmark/*
 Copyright: 2015-2017 Raph Levien <raph@google.com>
 License: MIT
 Comment: see https://github.com/google/pulldown-cmark
 
-Files: src/vendor/quick-error/*
+Files: vendor/quick-error/*
 Copyright: 2015-2017 Paul Colomiets <paul@colomiets.name>
            2015-2017 Colin Kiegel <kiegel@gmx.de>
 License: MIT or Apache-2.0
 Comment: see http://github.com/tailhook/quick-error
 
 Files:
- src/vendor/rayon/*
- src/vendor/rayon-core/*
- src/vendor/rustc-rayon/*
- src/vendor/rustc-rayon-core/*
+ vendor/rayon/*
+ vendor/rayon-core/*
+ vendor/rustc-rayon/*
+ vendor/rustc-rayon-core/*
 Copyright: 2014-2018 Niko Matsakis <niko@alum.mit.edu>
            2014-2018 Josh Stone <cuviper@gmail.com>
 License: Apache-2.0 or MIT
@@ -593,87 +602,87 @@ Comment:
  see https://github.com/rayon-rs/rayon
  see https://github.com/Zoxc/rayon/tree/rustc
 
-Files: src/vendor/redox_syscall/*
-       src/vendor/redox_termios/*
+Files: vendor/redox_syscall/*
+       vendor/redox_termios/*
 Copyright: 2016-2017 Jeremy Soller <jackpot51@gmail.com>
 License: MIT
 Comment: see https://github.com/redox-os/syscall
          see https://github.com/redox-os/termios
 
-Files: src/vendor/remove_dir_all/*
+Files: vendor/remove_dir_all/*
 Copyright: 2017-2018 Aaronepower <theaaronepower@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/Aaronepower/remove_dir_all.git
 
-Files: src/vendor/rls-data/*
-       src/vendor/rls-span/*
+Files: vendor/rls-data/*
+       vendor/rls-span/*
 Copyright: 2016-2017 Nick Cameron <ncameron@mozilla.com>
 License: Apache-2.0 or MIT
 Comment: see https://github.com/nrc/rls-span
          see https://github.com/nrc/rls-data
 
-Files: src/vendor/rustfix/*
+Files: vendor/rustfix/*
 Copyright: 2016-2018 Pascal Hertleif <killercup@gmail.com>
            2016-2018 Oliver Schneider <oli-obk@users.noreply.github.com>
 License: Apache-2.0 or MIT
 Comment: see https://github.com/killercup/rustfix
 
-Files: src/vendor/ryu/*
+Files: vendor/ryu/*
 Copyright: 2018-2018 David Tolnay <dtolnay@gmail.com>
 License: Apache-2.0 or BSL-1.0
 Comment: see https://github.com/dtolnay/ryu
 
-Files: src/vendor/serde/*
-       src/vendor/serde_json/*
+Files: vendor/serde/*
+       vendor/serde_json/*
 Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com>
 License: MIT or Apache-2.0
 Comment:
  see https://github.com/serde-rs/serde
  see https://github.com/serde-rs/json
 
-Files: src/vendor/serde_derive/*
+Files: vendor/serde_derive/*
 Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com>
            2016-2017 David Tolnay <dtolnay@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/serde-rs/serde
 
-Files: src/vendor/siphasher/*
+Files: vendor/siphasher/*
 Copyright: 2016-2018 Frank Denis <github@pureftpd.org>
 License: MIT or Apache-2.0
 Comment: see https://github.com/jedisct1/rust-siphash
 
-Files: src/vendor/shlex/*
+Files: vendor/shlex/*
 Copyright: 2015-2015 comex <comexk@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/comex/rust-shlex
 
-Files: src/vendor/smallvec/*
+Files: vendor/smallvec/*
 Copyright: 2015-2018 Simon Sapin <simon.sapin@exyr.org>
 License: MPL-2.0
 Comment: see https://github.com/servo/rust-smallvec
 
-Files: src/vendor/stable_deref_trait/*
+Files: vendor/stable_deref_trait/*
 Copyright: 2017-2017 Robert Grosse <n210241048576@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/storyyeller/stable_deref_trait
 
-Files: src/vendor/strsim/*
+Files: vendor/strsim/*
 Copyright: 2015 Danny Guo <dannyguo91@gmail.com>
 License: MIT
 Comment: see https://github.com/dguo/strsim-rs
 
 Files:
- src/vendor/strum/*
- src/vendor/strum_macros/*
+ vendor/strum/*
+ vendor/strum_macros/*
 Copyright: 2015-2018 Peter Glotfelty <peglotfe@microsoft.com>
 License: MIT
 
-Files: src/vendor/synstructure/*
+Files: vendor/synstructure/*
 Copyright: 2016-2018 Michael Layzell <michael@thelayzells.com>
 License: MIT
 Comment: see https://github.com/mystor/synstructure
 
-Files: src/vendor/tempfile/*
+Files: vendor/tempfile/*
 Copyright: 2015-2018 Steven Allen <steven@stebalien.com>
            2015-2018 The Rust Project Developers
            2015-2018 Ashley Mannix <ashleymannix@live.com.au>
@@ -681,75 +690,75 @@ Copyright: 2015-2018 Steven Allen <steven@stebalien.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/Stebalien/tempfile
 
-Files: src/vendor/tendril/*
+Files: vendor/tendril/*
 Copyright: 2015-2017 Keegan McAllister <mcallister.keegan@gmail.com>
            2015-2017 Simon Sapin <simon.sapin@exyr.org>
            2015-2017 Chris Morgan <me@chrismorgan.info>
 License: MIT or Apache-2.0
 Comment: see https://github.com/servo/tendril
 
-Files: src/vendor/termion/*
+Files: vendor/termion/*
 Copyright: 2016-2017 ticki <Ticki@users.noreply.github.com>
            2016-2017 gycos <alexandre.bury@gmail.com>
            2016-2017 IGI-111 <igi-111@protonmail.com>
 License: MIT
 Comment: see https://github.com/ticki/termion
 
-Files: src/vendor/textwrap/*
+Files: vendor/textwrap/*
 Copyright: 2016-2017 Martin Geisler <martin@geisler.net>
 License: MIT
 Comment: see https://github.com/mgeisler/textwrap
 
 Files:
- src/vendor/lock_api/*
- src/vendor/thread_local/*
- src/vendor/parking_lot/*
- src/vendor/parking_lot_core/*
- src/vendor/parking_lot_core-0*/*
+ vendor/lock_api/*
+ vendor/thread_local/*
+ vendor/parking_lot/*
+ vendor/parking_lot_core/*
+ vendor/parking_lot_core-0*/*
 Copyright: 2016-2018 Amanieu d'Antras <amanieu@gmail.com>
 License: MIT or Apache-2.0
 Comment:
  see https://github.com/Amanieu/thread_local-rs
  see https://github.com/Amanieu/parking_lot
 
-Files: src/vendor/petgraph/*
+Files: vendor/petgraph/*
 Copyright: 2014-2018 bluss
            2014-2018 mitchmindtree
 License: MIT or Apache-2.0
 Comment: see https://github.com/bluss/petgraph
 
 Files:
- src/vendor/phf/*
- src/vendor/phf_codegen/*
- src/vendor/phf_generator/*
- src/vendor/phf_shared/*
+ vendor/phf/*
+ vendor/phf_codegen/*
+ vendor/phf_generator/*
+ vendor/phf_shared/*
 Copyright: 2014-2018 Steven Fackler <sfackler@gmail.com>
 License: MIT
 Comment: see https://github.com/sfackler/rust-phf
 
-Files: src/vendor/precomputed-hash/*
+Files: vendor/precomputed-hash/*
 Copyright: 2017-2017 Emilio Cobos Álvarez <emilio@crisal.io>
 License: MIT
 Comment: see https://github.com/emilio/precomputed-hash
 
-Files: src/vendor/pretty_assertions/*
+Files: vendor/pretty_assertions/*
 Copyright: 2017-2018 Colin Kiegel <kiegel@gmx.de>
            2017-2018 Florent Fayolle <florent.fayolle69@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/colin-kiegel/rust-pretty-assertions
 
-Files: src/vendor/version_check/*
+Files: vendor/version_check/*
 Copyright: 2017-2018 Sergio Benitez <sb@sergio.bz>
 License: MIT or Apache-2.0
 Comment: see https://github.com/SergioBenitez/version_check
 
-Files: src/vendor/ucd-util/*
+Files: vendor/ucd-util/*
 Copyright: 2017-2018 Andrew Gallant <jamslam@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/BurntSushi/rucd
 
-Files: src/vendor/unicode-normalization/*
-       src/vendor/unicode-width/*
+Files: vendor/unicode-normalization/*
+       vendor/unicode-width/*
 Copyright: 2015-2017 kwantam <kwantam@gmail.com>
 License: MIT or Apache-2.0
 Comment:
@@ -758,14 +767,14 @@ Comment:
  see https://github.com/unicode-rs/unicode-normalization
 
 Files:
- src/vendor/unicode-xid/*
- src/vendor/unicode-xid-0*/*
+ vendor/unicode-xid/*
+ vendor/unicode-xid-0*/*
 Copyright: 2015-2017 erick.tryzelaar <erick.tryzelaar@gmail.com>
            2015-2017 kwantam <kwantam@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/unicode-rs/unicode-xid
 
-Files: src/vendor/vec_map/*
+Files: vendor/vec_map/*
 Copyright: 2015-2017 Alexis Beingessner <a.beingessner@gmail.com>
            2015-2017 Andrew Paseltiner <apaseltiner@gmail.com>
            2015-2017 contain-rs developers
@@ -774,9 +783,9 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/contain-rs/vec-map
 
 Files:
- src/vendor/mac/*
- src/vendor/unreachable/*
- src/vendor/void/*
+ vendor/mac/*
+ vendor/unreachable/*
+ vendor/void/*
 Copyright: 2014-2017 Jonathan Reem <jonathan.reem@gmail.com>
 License: MIT
 Comment:
@@ -784,28 +793,28 @@ Comment:
  see https://github.com/reem/rust-unreachable.git
  see https://github.com/reem/rust-void.git
 
-Files: src/vendor/utf-8/*
+Files: vendor/utf-8/*
 Copyright: 2015-2018 Simon Sapin <simon.sapin@exyr.org>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/SimonSapin/rust-utf8
 
-Files: src/vendor/winapi/*
+Files: vendor/winapi/*
 Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
            2014-2018 winapi-rs developers
 License: MIT
 Comment: see https://github.com/retep998/winapi-rs
 
-Files: src/vendor/winapi-*-pc-windows-gnu/*
+Files: vendor/winapi-*-pc-windows-gnu/*
 Copyright: 2014-2018 Peter Atashian <retep998@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/retep998/winapi-rs
 
-Files: src/vendor/xattr/*
+Files: vendor/xattr/*
 Copyright: 2015-2017 Steven Allen <steven@stebalien.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/Stebalien/xattr
 
-Files: src/vendor/yaml-rust/*
+Files: vendor/yaml-rust/*
 Copyright: 2015-2017 Yuheng Chen <yuhengchen@sensetime.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/chyh1990/yaml-rust

diff --git a/debian/patches/d-ignore-removed-submodules.patch b/debian/patches/d-ignore-removed-submodules.patch
index 45af5e097c0c9c3a9492c58b645b8d8dc3d698cf..c598798954b98dac4adab803d4c855c24bd17d63 100644 (file)
--- a/debian/patches/d-ignore-removed-submodules.patch
+++ b/debian/patches/d-ignore-removed-submodules.patch
@@ -1,29 +1,29 @@
 Description: Ignore submodules that we're not building
 Author: Ximin Luo <infinity0@debian.org>
 Forwarded: not-needed
---- a/src/Cargo.toml
-+++ b/src/Cargo.toml
+--- a/Cargo.toml
++++ b/Cargo.toml
 @@ -6,7 +6,6 @@
-   "libtest",
-   "librustc_codegen_llvm",
-   "tools/cargotest",
--  "tools/clippy",
-   "tools/compiletest",
-   "tools/error_index_generator",
-   "tools/linkchecker",
+   "src/libtest",
+   "src/librustc_codegen_llvm",
+   "src/tools/cargotest",
+-  "src/tools/clippy",
+   "src/tools/compiletest",
+   "src/tools/error_index_generator",
+   "src/tools/linkchecker",
 @@ -14,14 +13,8 @@
-   "tools/unstable-book-gen",
-   "tools/tidy",
-   "tools/build-manifest",
--  "tools/remote-test-client",
--  "tools/remote-test-server",
-   "tools/rust-installer",
--  "tools/cargo",
-   "tools/rustdoc",
--  "tools/rls",
--  "tools/rustfmt",
--  "tools/miri",
-   "tools/rustdoc-themes",
+   "src/tools/unstable-book-gen",
+   "src/tools/tidy",
+   "src/tools/build-manifest",
+-  "src/tools/remote-test-client",
+-  "src/tools/remote-test-server",
+   "src/tools/rust-installer",
+-  "src/tools/cargo",
+   "src/tools/rustdoc",
+-  "src/tools/rls",
+-  "src/tools/rustfmt",
+-  "src/tools/miri",
+   "src/tools/rustdoc-themes",
  ]
  exclude = [
 @@ -44,24 +37,7 @@
@@ -36,21 +36,21 @@ Forwarded: not-needed
 -# so we use a `[patch]` here to override the github repository with our local
 -# vendored copy.
 -[patch."https://github.com/rust-lang/cargo"]
--cargo = { path = "tools/cargo" }
+-cargo = { path = "src/tools/cargo" }
 -
  [patch.crates-io]
 -# 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 version).
--rustfmt-nightly = { path = "tools/rustfmt" }
+-rustfmt-nightly = { path = "src/tools/rustfmt" }
 -
- # See comments in `tools/rustc-workspace-hack/README.md` for what's going on
+ # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
  # here
- rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' }
+ rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
 -
 -[patch."https://github.com/rust-lang/rust-clippy"]
--clippy_lints = { path = "tools/clippy/clippy_lints" }
--rustc_tools_util = { path = "tools/clippy/rustc_tools_util" }
+-clippy_lints = { path = "src/tools/clippy/clippy_lints" }
+-rustc_tools_util = { path = "src/tools/clippy/rustc_tools_util" }
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
 @@ -639,10 +639,6 @@

diff --git a/debian/patches/d-no-web-dependencies-in-doc.patch b/debian/patches/d-no-web-dependencies-in-doc.patch
index 0924876b4acec62e498108538a00414725646c03..030567ac2f1b6a3e187b263dccccc1426866772a 100644 (file)
--- a/debian/patches/d-no-web-dependencies-in-doc.patch
+++ b/debian/patches/d-no-web-dependencies-in-doc.patch
@@ -23,8 +23,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          let mut parts = url.splitn(2, "#");
          let url = parts.next().unwrap();
          let fragment = parts.next();
---- a/src/vendor/mdbook/src/book/init.rs
-+++ b/src/vendor/mdbook/src/book/init.rs
+--- a/vendor/mdbook/src/book/init.rs
++++ b/vendor/mdbook/src/book/init.rs
 @@ -136,12 +136,6 @@
          let mut js = File::create(themedir.join("book.js"))?;
          js.write_all(theme::JS)?;
@@ -38,8 +38,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          Ok(())
      }
  
---- a/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-+++ b/src/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
+--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
++++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
 @@ -3,7 +3,7 @@
  use errors::*;
  use renderer::{RenderContext, Renderer};
@@ -111,8 +111,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
          Ok(())
      }
---- a/src/vendor/mdbook/src/theme/index.hbs
-+++ b/src/vendor/mdbook/src/theme/index.hbs
+--- a/vendor/mdbook/src/theme/index.hbs
++++ b/vendor/mdbook/src/theme/index.hbs
 @@ -12,15 +12,13 @@
          <base href="{{ path_to_root }}">
  
@@ -232,8 +232,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          <script src="book.js" type="text/javascript" charset="utf-8"></script>
  
          <!-- Custom JS scripts -->
---- a/src/vendor/mdbook/src/theme/mod.rs
-+++ b/src/vendor/mdbook/src/theme/mod.rs
+--- a/vendor/mdbook/src/theme/mod.rs
++++ b/vendor/mdbook/src/theme/mod.rs
 @@ -1,7 +1,5 @@
  #![allow(missing_docs)]
  
@@ -312,8 +312,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          };
  
          assert_eq!(got, empty);
---- a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
-+++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
+--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
++++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
 @@ -29,8 +29,6 @@
      if search_config.copy_js {
          utils::fs::write_file(destination, "searchindex.js", index.as_bytes())?;
@@ -323,8 +323,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          debug!("Copying search files ✓");
      }
  
---- a/src/vendor/mdbook/src/theme/searcher/mod.rs
-+++ b/src/vendor/mdbook/src/theme/searcher/mod.rs
+--- a/vendor/mdbook/src/theme/searcher/mod.rs
++++ b/vendor/mdbook/src/theme/searcher/mod.rs
 @@ -2,5 +2,3 @@
  //! the "search" cargo feature is disabled.
  

diff --git a/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch b/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
index 913fe4a5f5d19f985ce171ccaa8f908a9d1c054c..2f4acc0172deb45cb99084a0ea558914066db11d 100644 (file)
--- a/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
+++ b/debian/patches/u-0001-Fix-new-renamed_and_removed_lints-warning-247.patch
@@ -13,8 +13,8 @@ I've verified that this now produces no warnings with Rust 1.26.1 and
 
 diff --git a/src/error_chain.rs b/src/error_chain.rs
 index cbd42cd67eaf..0926c8889278 100644
---- a/src/vendor/error-chain-0.11.0/src/error_chain.rs
-+++ b/src/vendor/error-chain-0.11.0/src/error_chain.rs
+--- a/vendor/error-chain-0.11.0/src/error_chain.rs
++++ b/vendor/error-chain-0.11.0/src/error_chain.rs
 @@ -173,7 +173,7 @@ macro_rules! impl_error_chain_processed {
                  self.0.description()
              }
@@ -35,8 +35,8 @@ index cbd42cd67eaf..0926c8889278 100644
              if let Some(e) = e.downcast_ref::<$error_name>() {
 diff --git a/src/impl_error_chain_kind.rs b/src/impl_error_chain_kind.rs
 index d6c05c8a882b..d5e266389cd6 100644
---- a/src/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
-+++ b/src/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
+--- a/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
++++ b/vendor/error-chain-0.11.0/src/impl_error_chain_kind.rs
 @@ -264,7 +264,7 @@ macro_rules! impl_error_chain_kind {
              $item:ident: $imode:tt [$(#[$imeta:meta])*] [$( $var:ident: $typ:ty ),*] {$( $funcs:tt )*}
          )*}
@@ -57,8 +57,8 @@ index d6c05c8a882b..d5e266389cd6 100644
              pub fn description(&self) -> &str {
 diff --git a/src/lib.rs b/src/lib.rs
 index d0881fcef1c1..6421194f8ca8 100644
---- a/src/vendor/error-chain-0.11.0/src/lib.rs
-+++ b/src/vendor/error-chain-0.11.0/src/lib.rs
+--- a/vendor/error-chain-0.11.0/src/lib.rs
++++ b/vendor/error-chain-0.11.0/src/lib.rs
 @@ -1,5 +1,4 @@
  #![deny(missing_docs)]
 -#![allow(unknown_lints)] // to be removed when unused_doc_comments lints is merged

diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps
index a9728cdcd6c87ec8827ea0e89899f558e59b0293..2e337aff546df73fa79ffa4ca346b5357fbf29d7 100755 (executable)
--- a/debian/prune-unused-deps
+++ b/debian/prune-unused-deps
@@ -10,11 +10,11 @@ had_config_toml=$(if test -e "$scriptdir/debian/config.toml"; then echo true; el
 
 cp "$scriptdir/debian/config.toml" config.toml
 "$scriptdir/debian/ensure-patch" -N "$scriptdir/debian/patches/d-ignore-removed-submodules.patch"
-test -f src/Cargo.lock.orig || cp src/Cargo.lock src/Cargo.lock.orig
+test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig
 ./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap
 
 not_needed() {
-       diff -ru src/Cargo.lock.orig src/Cargo.lock | grep '^-"checksum' | cut '-d ' -f2-3
+       diff -ru Cargo.lock.orig Cargo.lock | grep '^-"checksum' | cut '-d ' -f2-3
 }
 
 ghetto_parse_cargo() {
@@ -25,7 +25,7 @@ ghetto_parse_cargo() {
 }
 
 pruned_paths() {
-       for i in src/vendor/*/Cargo.toml; do
+       for i in vendor/*/Cargo.toml; do
                pkgnamever=
                pkgnamever=$(ghetto_parse_cargo "$i")
                if [ -z "$pkgnamever" ]; then

diff --git a/debian/rules b/debian/rules
index db9c4255f6e904456c2d532d1cb80febb57fc494..743c7c225f13154b13e5caf4d28df3d099cd0411 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -174,12 +174,12 @@ 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
        # We patched some crates so have to rm the checksums
-       find src/vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" ";"
+       find vendor -name .cargo-checksum.json -execdir "$(CURDIR)/debian/prune-checksums" "{}" ";"
        # Unfortunately upstream uses a duplicate copy of libbacktrace and wants to
        # compile it again for rust-installer, see #43449
-       ln -rsf src/libbacktrace -t src/vendor/backtrace-sys/src/
+       ln -rsf src/libbacktrace -t vendor/backtrace-sys/src/
        # Link against system liblzma, see https://github.com/alexcrichton/xz2-rs/issues/16
-       echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' > src/vendor/lzma-sys/build.rs
+       echo 'fn main() { println!("cargo:rustc-link-lib=lzma"); }' > vendor/lzma-sys/build.rs
        # We don't run ./configure because we use debian/config.toml directly
        ln -sf debian/config.toml config.toml
        touch "$@"
@@ -194,7 +194,7 @@ endif
 override_dh_auto_clean:
        $(RM) -rf ./build ./tmp ./.cargo config.stamp config.mk Makefile
        $(RM) -rf $(TEST_LOG) debian/config.toml debian/rust-src.install debian/rust-src.links debian/*.stamp
-       $(RM) -rf $(SRC_CLEAN) config.toml src/vendor/backtrace-sys/src/libbacktrace
+       $(RM) -rf $(SRC_CLEAN) config.toml vendor/backtrace-sys/src/libbacktrace
 
 override_dh_auto_build-arch:
        $(RUSTBUILD) build $(RUSTBUILD_FLAGS)
@@ -325,10 +325,10 @@ override_dh_install-indep: debian/rust-src.install debian/rust-src.links
                \) -delete
        # Remove files that autoload remote resources, caught by lintian
        $(RM) -rf debian/rust-src/usr/src/rustc-*/src/tools/clippy/util/gh-pages/*
-       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/cssparser/docs/*.html
-       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/kuchiki/docs/*.html
-       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/url/docs/*.html
-       $(RM) -rf debian/rust-src/usr/src/rustc-*/src/vendor/xz2/.gitmodules
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/cssparser/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/kuchiki/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/url/docs/*.html
+       $(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/xz2/.gitmodules
 
 override_dh_installchangelogs:
        dh_installchangelogs RELEASES.md

diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
index 2d1d1cdd6495446a584b340c234c1039f62a2fa9..f02d50df85350267e59e4212d990beec53b18733 100644 (file)
--- a/debian/upstream-tarball-unsuspicious.txt
+++ b/debian/upstream-tarball-unsuspicious.txt
@@ -6,41 +6,45 @@ CONTRIBUTING.md
 src/doc/book/first-edition/src/the-stack-and-the-heap.md
 src/doc/book/*/tools/docx-to-md.xsl
 src/doc/rustc/src/lints/groups.md
-src/doc/rust-by-example/CODE_OF_CONDUCT.md
+src/doc/rustc-guide/.travis.yml
+src/doc/rustc-guide/src/*.md
+src/doc/rustc-guide/src/*/*.md
+src/doc/*/CODE_OF_CONDUCT.md
 src/doc/unstable-book/src/language-features/unsized-locals.md
 src/etc/third-party/README.txt
 src/libcompiler_builtins/compiler-rt/lib/BlocksRuntime/runtime.c
 src/libbacktrace/configure
 src/libbacktrace/config/libtool.m4
+src/librustc_codegen_ssa/README.md
 src/libstd/sys/cloudabi/abi/cloudabi.rs
 src/libstd/os/raw/*.md
 src/rustc/*/Cargo.toml
 src/tools/clippy/CONTRIBUTING.md
-src/vendor/*/.travis.yml
-src/vendor/*/Cargo.toml
-src/vendor/*/CHANGELOG.md
-src/vendor/*/CODE_OF_CONDUCT.md
-src/vendor/*/CONTRIBUTORS.md
-src/vendor/*/README.md
-src/vendor/*/README.tpl
-src/vendor/*/LICENSE
-src/vendor/*/*/LICENSE
-src/vendor/*/*/*/LICENSE
-src/vendor/ammonia/src/lib.rs
-src/vendor/clap/.github/CONTRIBUTING.md
+vendor/*/.travis.yml
+vendor/*/Cargo.toml
+vendor/*/CHANGELOG.md
+vendor/*/CODE_OF_CONDUCT.md
+vendor/*/CONTRIBUTORS.md
+vendor/*/README.md
+vendor/*/README.tpl
+vendor/*/LICENSE
+vendor/*/*/LICENSE
+vendor/*/*/*/LICENSE
+vendor/ammonia/src/lib.rs
+vendor/clap/.github/CONTRIBUTING.md
 # ^ author likes to omit line breaks in their comments
-src/vendor/failure/book/src/bail-and-ensure.md
+vendor/failure/book/src/bail-and-ensure.md
 # ^ same with this one
-src/vendor/handlebars/src/lib.rs
-src/vendor/maplit/README.rst
-src/vendor/lazy_static/src/lib.rs
-src/vendor/pulldown-cmark/tests/footnotes.rs
-src/vendor/pulldown-cmark/specs/footnotes.txt
-src/vendor/pulldown-cmark-*/tests/footnotes.rs
-src/vendor/pulldown-cmark-*/specs/footnotes.txt
-src/vendor/stable_deref_trait/src/lib.rs
-src/vendor/winapi-*/src/winnt.rs
-src/vendor/winapi/src/lib.rs
+vendor/handlebars/src/lib.rs
+vendor/maplit/README.rst
+vendor/lazy_static/src/lib.rs
+vendor/pulldown-cmark/tests/footnotes.rs
+vendor/pulldown-cmark/specs/footnotes.txt
+vendor/pulldown-cmark-*/tests/footnotes.rs
+vendor/pulldown-cmark-*/specs/footnotes.txt
+vendor/stable_deref_trait/src/lib.rs
+vendor/winapi-*/src/winnt.rs
+vendor/winapi/src/lib.rs
 
 # Embedded libraries, justified in README.source
 # None atm
@@ -48,9 +52,9 @@ src/vendor/winapi/src/lib.rs
 # False-positive, misc
 src/stdsimd/.travis.yml
 src/tools/clippy/.github/deploy_key.enc
-src/vendor/num/ci/deploy.enc
-src/vendor/elasticlunr-rs/src/lang/*.rs
-src/vendor/cloudabi/cloudabi.rs
+vendor/num/ci/deploy.enc
+vendor/elasticlunr-rs/src/lang/*.rs
+vendor/cloudabi/cloudabi.rs
 
 # False-positive, hand-editable small image
 src/etc/installer/gfx/
@@ -65,16 +69,16 @@ src/doc/book/2018-edition/src/img/*.svg
 src/doc/book/2018-edition/src/img/*.png
 src/doc/book/tools/docx-to-md.xsl
 src/librustdoc/html/static/*.svg
-src/vendor/difference/assets/*.png
-src/vendor/mdbook/src/theme/favicon.png
-src/vendor/num/doc/favicon.ico
-src/vendor/num/doc/rust-logo-128x128-blk-v2.png
-src/vendor/pest/pest-logo.svg
-src/vendor/pretty_assertions/examples/*.png
-src/vendor/termion/logo.svg
+vendor/difference/assets/*.png
+vendor/mdbook/src/theme/favicon.png
+vendor/num/doc/favicon.ico
+vendor/num/doc/rust-logo-128x128-blk-v2.png
+vendor/pest/pest-logo.svg
+vendor/pretty_assertions/examples/*.png
+vendor/termion/logo.svg
 
 # Example code
-src/vendor/html5ever/examples/capi/tokenize.c
+vendor/html5ever/examples/capi/tokenize.c
 
 # Test data
 src/stdsimd/crates/stdsimd-verify/x86-intel.xml
@@ -87,38 +91,38 @@ src/test/*/*.stderr
 src/test/*/*/*.stderr
 src/test/*/*/*/*.stderr
 src/tools/*/tests/*/*.stderr
-src/vendor/cssparser/src/css-parsing-tests/*.json
-src/vendor/cssparser/src/big-data-url.css
-src/vendor/elasticlunr-rs/tests/data/tr.in.txt
-src/vendor/flate2/tests/*.gz
-src/vendor/idna/tests/IdnaTest.txt
-src/vendor/html5ever/data/bench/*.html
-src/vendor/html5ever/html5lib-tests/*/*.dat
-src/vendor/html5ever/html5lib-tests/*/*.test
-src/vendor/pretty_assertions/src/format_changeset.rs
-src/vendor/regex/src/testdata/basic.dat
-src/vendor/regex/tests/crates_regex.rs
-src/vendor/regex/tests/fowler.rs
-src/vendor/regex-0*/src/testdata/basic.dat
-src/vendor/regex-0*/tests/fowler.rs
-src/vendor/rustc-demangle/src/lib.rs
-src/vendor/tar/tests/archives/*.tar
-src/vendor/toml/tests/*/*.toml
-src/vendor/toml/tests/*/*.json
-src/vendor/pest/benches/data.json
-src/vendor/yaml-rust/tests/specexamples.rs.inc
+vendor/cssparser/src/css-parsing-tests/*.json
+vendor/cssparser/src/big-data-url.css
+vendor/elasticlunr-rs/tests/data/tr.in.txt
+vendor/flate2/tests/*.gz
+vendor/idna/tests/IdnaTest.txt
+vendor/html5ever/data/bench/*.html
+vendor/html5ever/html5lib-tests/*/*.dat
+vendor/html5ever/html5lib-tests/*/*.test
+vendor/pretty_assertions/src/format_changeset.rs
+vendor/regex/src/testdata/basic.dat
+vendor/regex/tests/crates_regex.rs
+vendor/regex/tests/fowler.rs
+vendor/regex-0*/src/testdata/basic.dat
+vendor/regex-0*/tests/fowler.rs
+vendor/rustc-demangle/src/lib.rs
+vendor/tar/tests/archives/*.tar
+vendor/toml/tests/*/*.toml
+vendor/toml/tests/*/*.json
+vendor/pest/benches/data.json
+vendor/yaml-rust/tests/specexamples.rs.inc
 
 # Compromise, ideally we'd autogenerate these
 # Should already by documented in debian/copyright
 src/librustdoc/html/static/normalize.css
-src/vendor/unicode-normalization/src/tables.rs
+vendor/unicode-normalization/src/tables.rs
 
 # Compromise, ideally we'd package these in their own package
 src/librustdoc/html/static/*.woff
 
 # C and JS files not part of an external library
-src/vendor/mdbook/src/theme/book.js
-src/vendor/mdbook/src/theme/searcher/searcher.js
-src/vendor/miniz-sys/miniz.c
-src/vendor/walkdir/compare/nftw.c
-src/vendor/walkdir-*/compare/nftw.c
+vendor/mdbook/src/theme/book.js
+vendor/mdbook/src/theme/searcher/searcher.js
+vendor/miniz-sys/miniz.c
+vendor/walkdir/compare/nftw.c
+vendor/walkdir-*/compare/nftw.c