Merging debian version 1.68.2+dfsg1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

24 files changed, 536 insertions, 266 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 960cfa574..8ad8f09b7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -116,7 +116,7 @@ called "Using rustc in a Debian package".
 Foreign non-Debian platforms
 ----------------------------
 
-Targetting a non-Debian platform is not a common Debian crossbuilding pattern,
+Targeting a non-Debian platform is not a common Debian crossbuilding pattern,
 so we do something ad-hoc for our Debian rust packages.
 
 Instead of libstd-rust-dev:$arch (for an $arch that is not in Debian), we
diff --git a/debian/changelog b/debian/changelog
index b014ee2e9..41aa261b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+rustc (1.68.2+dfsg1-1) unstable; urgency=medium
+
+  * Upload to unstable
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sun, 10 Sep 2023 19:22:53 +0200
+
+rustc (1.68.2+dfsg1-1~exp1) experimental; urgency=medium
+
+  [ Eric Long ]
+  * New upstream version 1.68.2+dfsg1
+  * Update patches to adapt to upstream test path change
+
+  [ Fabian Grünbichler ]
+  * Update wasi-libc to 4362b18
+  * Update doc path to fix linkcheck
+  * Update d/copyright
+  * Update lintian overrides
+  * Update privacy breach removal (github badge)
+  * Bump Standards-Version to 4.6.2
+
+  [Helmut Grohne]
+  * Fix FTCBFS: Do not pass host CFLAGS to the build compiler
+    (Closes: #1050975)
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 02 Aug 2023 13:17:47 +0200
+
 rustc (1.67.1+dfsg1-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 99a92071e..c4e52a3d3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
  dpkg-dev (>= 1.17.14),
  python3:native,
  cargo:native (>= 0.60.0)      <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.66.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.67.1++)    <!pkg.rustc.dlstage0>,
+ rustc:native (>= 1.67.0+dfsg) <!pkg.rustc.dlstage0>,
+ rustc:native (<= 1.68.2++)    <!pkg.rustc.dlstage0>,
  llvm-15-dev:native,
  llvm-15-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
@@ -42,11 +42,11 @@ Build-Depends:
  curl <pkg.rustc.dlstage0>,
  ca-certificates <pkg.rustc.dlstage0>,
 Build-Depends-Indep:
- wasi-libc (>= 0.0~git20221206.8b7148f~~) <!nowasm>,
- wasi-libc (<= 0.0~git20221206.8b7148f++) <!nowasm>,
+ wasi-libc (>= 0.0~git20230113.4362b18~~) <!nowasm>,
+ wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
  clang-15:native,
 Build-Conflicts: gdb-minimal <!nocheck>
-Standards-Version: 4.2.1
+Standards-Version: 4.6.2
 Homepage: http://www.rust-lang.org/
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/rustc
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/rustc
@@ -61,7 +61,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends:
- cargo (>= 0.68.0~~), cargo (<< 0.69.0~~),
+ cargo (>= 0.69.0~~), cargo (<< 0.70.0~~),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
  llvm-15,
 Suggests:
@@ -82,7 +82,7 @@ Description: Rust systems programming language
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.67
+Package: libstd-rust-1.68
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -109,7 +109,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.67 (= ${binary:Version}),
+ libstd-rust-1.68 (= ${binary:Version}),
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -272,7 +272,7 @@ Package: rust-clippy
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.67 (= ${binary:Version})
+ libstd-rust-1.68 (= ${binary:Version})
 Recommends: cargo
 Description: Rust linter
  Rust is a curly-brace, block-structured expression language.  It
@@ -327,7 +327,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
  rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
  cargo,
 Recommends:
- cargo (>= 0.68.0~~), cargo (<< 0.69.0~~)
+ cargo (>= 0.69.0~~), cargo (<< 0.70.0~~)
 Suggests:
  rust-doc (>= ${binary:Version}),
  rust-src (>= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index ec184ada3..873a9fc7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,24 +44,24 @@ Files-Excluded:
 # unused dependencies, generated by debian/prune-unused-deps
 # DO NOT EDIT below, AUTOGENERATED
  vendor/ahash-0.7.4
- vendor/anyhow-1.0.60
+ vendor/ansi_term-0.11.0
+ vendor/anyhow-1.0.65
  vendor/anymap
  vendor/arbitrary
  vendor/arrayvec-0.7.0
+ vendor/base16ct
  vendor/base64
+ vendor/base64ct
  vendor/bitmaps
  vendor/bstr
  vendor/bumpalo
- vendor/byteorder
  vendor/bytesize
  vendor/camino-1.0.9
  vendor/cc-1.0.73
- vendor/chalk-derive-0.86.0
- vendor/chalk-ir-0.86.0
+ vendor/chalk-derive
+ vendor/chalk-ir
  vendor/chalk-recursive
- vendor/chalk-solve-0.86.0
- vendor/clap
- vendor/clap_lex
+ vendor/chalk-solve
  vendor/color-eyre
  vendor/color-spantrace
  vendor/combine
@@ -70,6 +70,7 @@ Files-Excluded:
  vendor/commoncrypto-sys
  vendor/concolor
  vendor/concolor-query
+ vendor/const-oid
  vendor/content_inspector
  vendor/core-foundation
  vendor/core-foundation-sys-0.8.0
@@ -77,6 +78,7 @@ Files-Excluded:
  vendor/cranelift-codegen
  vendor/cranelift-codegen-meta
  vendor/cranelift-codegen-shared
+ vendor/cranelift-egraph
  vendor/cranelift-entity
  vendor/cranelift-frontend
  vendor/cranelift-isle
@@ -84,25 +86,31 @@ Files-Excluded:
  vendor/cranelift-module
  vendor/cranelift-native
  vendor/cranelift-object
- vendor/crossbeam-deque-0.8.1
  vendor/crossbeam-epoch-0.9.11
- vendor/crossbeam-epoch-0.9.6
  vendor/crossbeam-utils-0.8.12
- vendor/crossbeam-utils-0.8.8
+ vendor/crypto-bigint
  vendor/crypto-common-0.1.3
  vendor/crypto-hash
+ vendor/ct-codecs
+ vendor/ctor-0.1.22
  vendor/curl
  vendor/curl-sys
+ vendor/der
  vendor/derive_arbitrary
  vendor/diff-0.1.12
+ vendor/difference
  vendor/digest-0.10.3
  vendor/directories
  vendor/dot
  vendor/dunce
+ vendor/ecdsa
+ vendor/ed25519-compact
  vendor/either-1.6.0
  vendor/either-1.6.1
- vendor/env_logger
+ vendor/elliptic-curve
  vendor/eyre
+ vendor/ff
+ vendor/fiat-crypto
  vendor/filetime-0.2.14
  vendor/filetime-0.2.16
  vendor/flate2-1.0.23
@@ -116,42 +124,47 @@ Files-Excluded:
  vendor/fwdansi
  vendor/fxhash
  vendor/generic-array-0.14.4
- vendor/getrandom-0.2.0
- vendor/gimli-0.26.1
  vendor/git2
  vendor/git2-curl
  vendor/globset-0.4.8
+ vendor/group
+ vendor/handlebars-3.5.5
  vendor/heck-0.3.3
  vendor/hex-0.3.2
  vendor/hex-0.4.2
+ vendor/hkalbasi-rustc-ap-rustc_abi
+ vendor/hkalbasi-rustc-ap-rustc_index
+ vendor/hkdf
  vendor/hmac
  vendor/home-0.5.3
  vendor/http-auth
  vendor/idna-0.2.0
  vendor/im-rc
  vendor/indenter
+ vendor/indexmap-1.9.1
  vendor/inotify
  vendor/inotify-sys
  vendor/io-lifetimes-1.0.1
- vendor/is-terminal
  vendor/itoa-1.0.2
  vendor/jemalloc-sys
  vendor/jod-thread
+ vendor/js-sys
  vendor/kqueue
  vendor/kqueue-sys
  vendor/kstring
- vendor/libc-0.2.127
  vendor/libc-0.2.135
  vendor/libc-0.2.137
  vendor/libffi
  vendor/libffi-sys
  vendor/libgit2-sys
  vendor/libloading-0.7.1
+ vendor/libloading-0.7.3
  vendor/libmimalloc-sys
  vendor/libnghttp2-sys
  vendor/libssh2-sys
  vendor/libz-sys
  vendor/linked-hash-map
+ vendor/linux-raw-sys-0.1.3
  vendor/lock_api-0.4.7
  vendor/log-0.4.14
  vendor/lzma-sys-0.1.16
@@ -164,7 +177,6 @@ Files-Excluded:
  vendor/normalize-line-endings
  vendor/notify
  vendor/once_cell-1.12.0
- vendor/once_cell-1.13.0
  vendor/once_cell-1.15.0
  vendor/oorandom
  vendor/openssl
@@ -172,16 +184,24 @@ Files-Excluded:
  vendor/openssl-src
  vendor/openssl-sys
  vendor/ordered-float
+ vendor/orion
  vendor/os_info
  vendor/owo-colors
+ vendor/p384
+ vendor/pasetors
  vendor/paste
+ vendor/pem-rfc7468
  vendor/percent-encoding-2.1.0
  vendor/pin-project-lite-0.2.8
+ vendor/pkcs8
+ vendor/pretty_assertions-0.6.1
  vendor/pretty_env_logger
  vendor/proc-macro2-1.0.46
  vendor/protobuf
  vendor/protobuf-support
+ vendor/pulldown-cmark-0.7.2
  vendor/pulldown-cmark-to-cmark
+ vendor/quick-error
  vendor/quote-1.0.18
  vendor/rayon-1.5.3
  vendor/rayon-core-1.9.3
@@ -191,13 +211,17 @@ Files-Excluded:
  vendor/regex-1.5.6
  vendor/regex-syntax-0.6.26
  vendor/region
+ vendor/rfc6979
  vendor/rustc-build-sysroot
+ vendor/rustc_tools_util-0.2.1
+ vendor/rustix-0.36.3
  vendor/ryu-1.0.10
  vendor/ryu-1.0.5
  vendor/salsa
  vendor/salsa-macros
  vendor/schannel
  vendor/scip
+ vendor/sec1
  vendor/security-framework
  vendor/security-framework-sys
  vendor/semver-1.0.12
@@ -209,24 +233,23 @@ Files-Excluded:
  vendor/serde_json-1.0.81
  vendor/serde_json-1.0.85
  vendor/serde-value
- vendor/sha1
- vendor/sha2-0.10.1
+ vendor/sha2-0.10.2
  vendor/sharded-slab-0.1.1
+ vendor/signature
  vendor/similar
  vendor/sized-chunks
  vendor/slice-group-by
  vendor/smallvec-1.8.1
- vendor/smallvec-1.9.0
  vendor/snap-1.0.1
  vendor/snapbox
  vendor/snapbox-macros
  vendor/socket2
- vendor/static_assertions
+ vendor/spki
  vendor/strip-ansi-escapes
  vendor/subtle
  vendor/target-lexicon
- vendor/thiserror-1.0.33
- vendor/thiserror-impl-1.0.33
+ vendor/thiserror-1.0.37
+ vendor/thiserror-impl-1.0.37
  vendor/threadpool
  vendor/tikv-jemallocator
  vendor/tikv-jemalloc-ctl
@@ -250,17 +273,30 @@ Files-Excluded:
  vendor/url-2.2.2
  vendor/utf8parse
  vendor/vcpkg
- vendor/version_check-0.9.3
  vendor/vte
+ vendor/wasm-bindgen-backend
+ vendor/wasm-bindgen
+ vendor/wasm-bindgen-macro
+ vendor/wasm-bindgen-macro-support
+ vendor/wasm-bindgen-shared
+ vendor/wasmtime-jit-icache-coherence
+ vendor/windows_aarch64_gnullvm-0.42.0
  vendor/windows_aarch64_msvc-0.36.1
+ vendor/windows_aarch64_msvc-0.42.0
  vendor/windows_i686_gnu-0.36.1
+ vendor/windows_i686_gnu-0.42.0
  vendor/windows_i686_msvc-0.36.1
+ vendor/windows_i686_msvc-0.42.0
  vendor/windows-sys-0.36.1
  vendor/windows_x86_64_gnu-0.36.1
+ vendor/windows_x86_64_gnu-0.42.0
+ vendor/windows_x86_64_gnullvm-0.42.0
  vendor/windows_x86_64_msvc-0.36.1
+ vendor/windows_x86_64_msvc-0.42.0
  vendor/xattr-0.2.2
  vendor/yaml-merge-keys
  vendor/yaml-rust
+ vendor/zeroize
 # DO NOT EDIT above, AUTOGENERATED
 
 Files: C*.md
@@ -284,7 +320,7 @@ Files: C*.md
        src/rust*
        src/stage0.json
        src/tools/*
-       src/test/*
+       tests/*
        src/version
        version
        x.py
@@ -322,7 +358,9 @@ Copyright: 2015-2020 The Rust Project Developers
 License: Apache-2.0 or MIT
 Comment: see https://github.com/laumann/compiletest-rs
 
-Files: vendor/ahash/*
+Files:
+ vendor/ahash/*
+ vendor/ahash-0.*/*
 Copyright: 2019-2022 Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/tkaitchuck/ahash
@@ -343,6 +381,7 @@ Files:
  vendor/bitflags/*
  vendor/cc/*
  vendor/cmake/*
+ vendor/env_logger/*
  vendor/env_logger-0.*/*
  vendor/getopts/*
  vendor/glob/*
@@ -352,6 +391,7 @@ Files:
  vendor/regex-syntax/*
  vendor/rustc-hash/*
  vendor/time/*
+ vendor/time-0.*/*
 Copyright: 2010-2021 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment:
@@ -360,6 +400,14 @@ Comment:
  same MIT/Apache-2.0 dual-license. See https://github.com/rust-lang.
  Exceptions are noted below.
 
+Files:
+ vendor/time-core/*
+ vendor/time-macros/*
+Copyright: 2019-2023 Jacob Pratt <open-source@jhpratt.dev>
+           2019-2023 Time contributors
+License: MIT OR Apache-2.0
+Comment: see https://github.com/time-rs/time
+
 Files: vendor/core-foundation-sys/*
 Copyright: 2012-2022 The Servo Project Developers
 License: MIT  or  Apache-2.0
@@ -386,14 +434,9 @@ Comment: see https://github.com/servo/
 
 Files:
  vendor/getrandom/*
- vendor/getrandom-0*/*
  vendor/rand/*
- vendor/rand-0*/*
  vendor/rand_chacha/*
- vendor/rand_chacha-0*/*
  vendor/rand_core/*
- vendor/rand_core-0*/*
- vendor/rand_hc/*
  vendor/rand_xorshift/*
  vendor/rand_xoshiro/*
 Copyright: 2010-2019 The Rand Project Developers
@@ -405,7 +448,6 @@ Comment:
  see https://github.com/rust-random/small-rngs
 
 Files:
- vendor/cfg-if-0*/*
  vendor/cfg-if/*
  vendor/filetime/*
  vendor/flate2/*
@@ -510,7 +552,7 @@ Files:
  vendor/block-buffer/*
  vendor/digest/*
  vendor/md-5/*
- vendor/sha-1/*
+ vendor/sha1/*
  vendor/sha2/*
 Copyright: 2016-2020 RustCrypto Developers
 License: MIT or Apache-2.0
@@ -530,6 +572,11 @@ Copyright: 2016-2020 Andre Bogus <bogusandre@gmail.de>
 License: Apache-2.0 or MIT
 Comment: see https://github.com/llogiq/bytecount
 
+Files: vendor/byteorder/*
+Copyright: 2015-2023 Andrew Gallant <jamslam@gmail.com>
+License: Unlicense OR MIT
+Comment: see https://github.com/BurntSushi/byteorder
+
 Files:
  vendor/globset/*
  vendor/ignore/*
@@ -574,10 +621,10 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/cryptocorrosion/cryptocorrosion
 
 Files:
- vendor/chalk-derive/*
+ vendor/chalk-derive-0.*/*
  vendor/chalk-engine/*
- vendor/chalk-ir/*
- vendor/chalk-solve/*
+ vendor/chalk-ir-0.*/*
+ vendor/chalk-solve-0.*/*
 Copyright:
  2015-2022 Rust Compiler Team
  2015-2022 Chalk developers
@@ -590,9 +637,12 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/chronotope/chrono
 
 Files: 
+ vendor/clap/*
  vendor/clap-3.*/*
  vendor/clap_complete/*
  vendor/clap_derive/*
+ vendor/clap_derive-3.*/*
+ vendor/clap_lex/*
  vendor/clap_lex-0.*/*
 Copyright: 2015-2022 Kevin K. <kbknapp@gmail.com>
 License: MIT
@@ -836,7 +886,7 @@ Comment: see https://github.com/withoutboats/heck
 
 Files:
  vendor/hermit-abi/*
- vendor/hermit-abi-0.1.19/*
+ vendor/hermit-abi-0.*/*
 Copyright: 2019-2019 Stefan Lankes
 License: MIT or Apache-2.0
 Comment: see https://github.com/hermitcore/hermit-abi
@@ -910,6 +960,12 @@ Copyright: 2021-2022 Dan Gohman <dev@sunfishcode.online>
 License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT
 Comment: see https://github.com/sunfishcode/io-lifetimes
 
+Files: vendor/is-terminal/*
+Copyright: 2022-2023 softprops <d.tangren@gmail.com>
+           2022-2023 Dan Gohman <dev@sunfishcode.online>
+License: MIT
+Comment: see https://github.com/sunfishcode/is-terminal
+
 Files: vendor/jsonpath_lib/*
 Copyright: 2018-2021 Changseok Han <freestrings@gmail.com>
 License: MIT
@@ -1023,6 +1079,7 @@ Comment: see https://github.com/seanmonstar/num_cpus
 
 Files:
     vendor/object/*
+    vendor/object-0.*/*
 Copyright:
  2016-2020 Nick Fitzgerald <fitzgen@gmail.com>
  2016-2020 Philip Craig <philipjcraig@gmail.com>
@@ -1056,6 +1113,7 @@ Comment: see https://github.com/Phundrak/output-vt100-rs
 
 Files:
  vendor/hashbrown/*
+ vendor/hashbrown-0.*/*
  vendor/lock_api/*
  vendor/thread_local/*
  vendor/parking_lot/*
@@ -1165,7 +1223,7 @@ License: MIT
 Comment: see https://github.com/mcarton/rust-punycode.git
 
 Files:
- vendor/quick-error/*
+ vendor/quick-error-1.*/*
 Copyright:
  2015-2020 Paul Colomiets <paul@colomiets.name>
  2015-2020 Colin Kiegel <kiegel@gmx.de>
@@ -1357,6 +1415,11 @@ Copyright: 2015-2020 Alex Crichton <alex@alexcrichton.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/rust-lang/stacker
 
+Files: vendor/static_assertions/*
+Copyright: 2017-2020 Nikolai Vazquez
+License: MIT OR Apache-2.0
+Comment: see https://github.com/nvzqz/static-assertions-rs
+
 Files: vendor/strsim/*
 Copyright: 2015-2021 Danny Guo <dannyguo91@gmail.com>
 License: MIT
@@ -1402,6 +1465,11 @@ Copyright:
 License: MIT or Apache-2.0
 Comment: see https://github.com/Stebalien/term
 
+Files: vendor/terminal_size/*
+Copyright: 2015-2023 Andrew Chin <achin@eminence32.net>
+License: MIT OR Apache-2.0
+Comment: see https://github.com/eminence/terminal-size
+
 Files: vendor/termize/*
 Copyright: 2016-2020 Yuki Okushi <huyuumi.dev@gmail.com>
 License: MIT or Apache-2.0
@@ -1475,6 +1543,11 @@ Copyright: 2020-2020 David Barsky <me@davidbarsky.com>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/davidbarsky/tracing-tree
 
+Files: vendor/twox-hash/*
+Copyright: 2015-2022 Jake Goulding <jake.goulding@gmail.com>
+License: MIT
+Comment: see https://github.com/shepmaster/twox-hash
+
 Files: vendor/type-map/*
 Copyright: 2019-2022 Jacob Brown <kardeiz@gmail.com>
 License: MIT or Apache-2.0
@@ -1668,13 +1741,10 @@ Copyright:
 License: MIT
 Comment: see https://github.com/tokio-rs/valuable
 
-Files: vendor/wasi-0.9.0+wasi-snapshot-preview1/*
-Copyright: 2019-2022 The Cranelift Project Developers
-License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT
-Comment: see https://github.com/bytecodealliance/wasi
-
 Files:
  vendor/windows-sys/*
+ vendor/windows-sys-0.*/*
+ vendor/windows-targets/*
  vendor/windows_aarch64_gnullvm/*
  vendor/windows_aarch64_msvc/*
  vendor/windows_i686_gnu/*
@@ -1682,7 +1752,7 @@ Files:
  vendor/windows_x86_64_gnu/*
  vendor/windows_x86_64_gnullvm/*
  vendor/windows_x86_64_msvc/*
-Copyright: 2019-2022 Microsoft Corporation
+Copyright: 2019-2023 Microsoft Corporation
 License: MIT OR Apache-2.0
 Comment: see https://github.com/microsoft/windows-rs
 
@@ -1705,6 +1775,13 @@ Copyright: 2020-2022 Aleksey Kladov <aleksey.kladov@gmail.com>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/matklad/xshell
 
+Files: vendor/zip/*
+Copyright: 2014-2023 Mathijs van de Nes <git@mathijs.vd-nes.nl>
+           2014-2023 Marli Frost <marli@frost.red>
+           2014-2023 Ryan Levick <ryan.levick@gmail.com>
+License: MIT
+Comment: see https://github.com/zip-rs/zip.git
+
 Files:
  vendor/icu_list/*
  vendor/icu_locid/*
diff --git a/debian/libstd-rust-1.67.lintian-overrides b/debian/libstd-rust-1.67.lintian-overrides
deleted file mode 100644
index 42712d63f..000000000
--- a/debian/libstd-rust-1.67.lintian-overrides
+++ /dev/null
@@ -1,13 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.67 binary: package-name-doesnt-match-sonames
-libstd-rust-1.67 binary: sharedobject-in-library-directory-missing-soname
-
-# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
-libstd-rust-1.67 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.67 binary: shlib-without-versioned-soname
-libstd-rust-1.67 binary: unused-shlib-entry-in-control-file
-
-# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
-# to libc.  Lintian gets upset that some Rust libraries don't need
-# libc, boo hoo.
-libstd-rust-1.67 binary: library-not-linked-against-libc
diff --git a/debian/libstd-rust-1.67.install b/debian/libstd-rust-1.68.install
index cd4545cca..cd4545cca 100644
--- a/debian/libstd-rust-1.67.install
+++ b/debian/libstd-rust-1.68.install
diff --git a/debian/libstd-rust-1.68.lintian-overrides b/debian/libstd-rust-1.68.lintian-overrides
new file mode 100644
index 000000000..2c675068f
--- /dev/null
+++ b/debian/libstd-rust-1.68.lintian-overrides
@@ -0,0 +1,13 @@
+# "libstd" just seemed too generic
+libstd-rust-1.68 binary: package-name-doesnt-match-sonames
+libstd-rust-1.68 binary: sharedobject-in-library-directory-missing-soname
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.68 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.68 binary: shlib-without-versioned-soname
+libstd-rust-1.68 binary: unused-shlib-entry-in-control-file
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc.  Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.68 binary: library-not-linked-against-libc
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 5ce806e79..6c3b0cfad 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -3,22 +3,22 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
 Subject: d-0000-ignore-removed-submodules
 
 ---
- Cargo.toml                         | 15 ---------------
+ Cargo.toml                         | 17 -----------------
  src/bootstrap/bootstrap.py         |  4 ----
- src/bootstrap/builder.rs           | 17 +----------------
+ src/bootstrap/builder.rs           | 18 +-----------------
  src/bootstrap/doc.rs               |  1 -
  src/bootstrap/test.rs              | 12 +-----------
  src/tools/clippy/Cargo.toml        |  5 -----
  src/tools/rust-analyzer/Cargo.toml | 11 ++++++++++-
  src/tools/rustfmt/Cargo.toml       |  5 -----
- src/tools/tidy/src/deps.rs         |  2 +-
- 9 files changed, 13 insertions(+), 59 deletions(-)
+ src/tools/tidy/src/deps.rs         |  4 +++-
+ 9 files changed, 15 insertions(+), 62 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 000c10a..7442a0e 100644
+index 15cbb26..c012319 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -17,27 +17,15 @@ members = [
+@@ -18,29 +18,15 @@ members = [
    "src/tools/tidy",
    "src/tools/tier-check",
    "src/tools/build-manifest",
@@ -30,6 +30,8 @@ index 000c10a..7442a0e 100644
 -  "src/tools/cargo/crates/credential/cargo-credential-1password",
 -  "src/tools/cargo/crates/credential/cargo-credential-macos-keychain",
 -  "src/tools/cargo/crates/credential/cargo-credential-wincred",
+-  "src/tools/cargo/crates/mdman",
+-  # "src/tools/cargo/crates/resolver-tests",
    "src/tools/rustdoc",
 -  "src/tools/rls",
    "src/tools/rustfmt",
@@ -46,7 +48,7 @@ index 000c10a..7442a0e 100644
    "src/tools/lld-wrapper",
    "src/tools/collect-license-metadata",
    "src/tools/generate-copyright",
-@@ -102,9 +90,6 @@ miniz_oxide.debug = 0
+@@ -105,9 +91,6 @@ miniz_oxide.debug = 0
  object.debug = 0
  
  [patch.crates-io]
@@ -57,10 +59,10 @@ index 000c10a..7442a0e 100644
  # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
  # here
 diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 2d5018d..cc2ae13 100644
+index 9cf43fc..39b985f 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -767,10 +767,6 @@ class RustBuild(object):
+@@ -770,10 +770,6 @@ class RustBuild(object):
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
          for _ in range(0, self.verbose):
              args.append("--verbose")
@@ -72,10 +74,10 @@ index 2d5018d..cc2ae13 100644
              args.append("--features")
              args.append("build-metrics")
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 8ee6d49..8bc92c8 100644
+index b4fc1d4..2bb0659 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -596,8 +596,6 @@ impl<'a> Builder<'a> {
+@@ -629,8 +629,6 @@ impl<'a> Builder<'a> {
                  tool::RemoteTestClient,
                  tool::RustInstaller,
                  tool::Cargo,
@@ -84,7 +86,7 @@ index 8ee6d49..8bc92c8 100644
                  tool::RustAnalyzerProcMacroSrv,
                  tool::RustDemangler,
                  tool::Rustdoc,
-@@ -618,10 +616,6 @@ impl<'a> Builder<'a> {
+@@ -651,10 +649,6 @@ impl<'a> Builder<'a> {
                  check::CodegenBackend,
                  check::Clippy,
                  check::Miri,
@@ -95,7 +97,7 @@ index 8ee6d49..8bc92c8 100644
                  check::Rustfmt,
                  check::Bootstrap
              ),
-@@ -650,7 +644,6 @@ impl<'a> Builder<'a> {
+@@ -684,7 +678,6 @@ impl<'a> Builder<'a> {
                  test::ReplacePlaceholderTest,
                  test::Cargotest,
                  test::Cargo,
@@ -103,10 +105,11 @@ index 8ee6d49..8bc92c8 100644
                  test::ErrorIndex,
                  test::Distcheck,
                  test::RunMakeFullDeps,
-@@ -698,10 +691,8 @@ impl<'a> Builder<'a> {
+@@ -732,11 +725,8 @@ impl<'a> Builder<'a> {
                  doc::RustdocBook,
                  doc::RustByExample,
                  doc::RustcBook,
+-                doc::Cargo,
 -                doc::CargoBook,
                  doc::Clippy,
                  doc::ClippyBook,
@@ -114,7 +117,7 @@ index 8ee6d49..8bc92c8 100644
                  doc::EmbeddedBook,
                  doc::EditionGuide,
                  doc::StyleGuide,
-@@ -717,8 +708,6 @@ impl<'a> Builder<'a> {
+@@ -752,8 +742,6 @@ impl<'a> Builder<'a> {
                  dist::Analysis,
                  dist::Src,
                  dist::Cargo,
@@ -123,7 +126,7 @@ index 8ee6d49..8bc92c8 100644
                  dist::Rustfmt,
                  dist::RustDemangler,
                  dist::Clippy,
-@@ -739,7 +728,6 @@ impl<'a> Builder<'a> {
+@@ -774,7 +762,6 @@ impl<'a> Builder<'a> {
                  install::Docs,
                  install::Std,
                  install::Cargo,
@@ -131,7 +134,7 @@ index 8ee6d49..8bc92c8 100644
                  install::Rustfmt,
                  install::RustDemangler,
                  install::Clippy,
-@@ -1823,10 +1811,7 @@ impl<'a> Builder<'a> {
+@@ -1889,10 +1876,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -144,10 +147,10 @@ index 8ee6d49..8bc92c8 100644
          }
  
 diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index 2c6fd1e..52c3eba 100644
+index 9bad904..d02edb0 100644
 --- a/src/bootstrap/doc.rs
 +++ b/src/bootstrap/doc.rs
-@@ -74,7 +74,6 @@ macro_rules! book {
+@@ -75,7 +75,6 @@ macro_rules! book {
  // FIXME: Make checking for a submodule automatic somehow (maybe by having a list of all submodules
  // and checking against it?).
  book!(
@@ -156,10 +159,10 @@ index 2c6fd1e..52c3eba 100644
      EditionGuide, "src/doc/edition-guide", "edition-guide", submodule;
      EmbeddedBook, "src/doc/embedded-book", "embedded-book", submodule;
 diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 39cedfd..7ed7d97 100644
+index 6078e39..1a385f5 100644
 --- a/src/bootstrap/test.rs
 +++ b/src/bootstrap/test.rs
-@@ -1975,17 +1975,7 @@ impl Step for RustcGuide {
+@@ -2005,17 +2005,7 @@ impl Step for RustcGuide {
      }
  
      fn run(self, builder: &Builder<'_>) {
@@ -179,7 +182,7 @@ index 39cedfd..7ed7d97 100644
  }
  
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index fe425a2..23beb15 100644
+index f8cb4b7..3aa9ec6 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
 @@ -36,11 +36,6 @@ walkdir = "2.3"
@@ -231,10 +234,10 @@ index 7a4e02d..27b91f2 100644
  
  [package.metadata.rust-analyzer]
 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
-index 296db9d..0369861 100644
+index bc2edf6..142c2e9 100644
 --- a/src/tools/tidy/src/deps.rs
 +++ b/src/tools/tidy/src/deps.rs
-@@ -333,7 +333,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
+@@ -332,7 +332,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
      // This crate takes quite a long time to build, so don't allow two versions of them
      // to accidentally sneak into our dependency graph, in order to ensure we keep our CI times
      // under control.
@@ -243,12 +246,12 @@ index 296db9d..0369861 100644
  ];
  
  /// Dependency checks.
-@@ -629,6 +629,8 @@
+@@ -608,6 +608,8 @@ fn direct_deps_of<'a>(metadata: &'a Metadata, pkg_id: &'a PackageId) -> Vec<&'a
  }
-
+ 
  fn check_rustfix(metadata: &Metadata, bad: &mut bool) {
 +    // Debian: we don't build cargo here, so this function doens't function.
 +    return;
      let cargo = pkg_from_name(metadata, "cargo");
      let compiletest = pkg_from_name(metadata, "compiletest");
-     let cargo_deps = deps_of(metadata, &cargo.id);
+     let cargo_deps = direct_deps_of(metadata, &cargo.id);
diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
index c544053bc..cd17dc2e6 100644
--- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
@@ -6,12 +6,12 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
 ---
  src/tools/linkchecker/main.rs                      | 28 ++++++-
  vendor/mdbook/src/book/init.rs                     |  6 --
- .../src/renderer/html_handlebars/hbs_renderer.rs   | 80 ++-----------------
+ .../src/renderer/html_handlebars/hbs_renderer.rs   | 80 ++----------------
  .../mdbook/src/renderer/html_handlebars/search.rs  |  2 -
- vendor/mdbook/src/theme/index.hbs                  | 93 +---------------------
- vendor/mdbook/src/theme/mod.rs                     | 27 -------
+ vendor/mdbook/src/theme/index.hbs                  | 97 +---------------------
+ vendor/mdbook/src/theme/mod.rs                     | 27 ------
  vendor/mdbook/src/theme/searcher/mod.rs            |  2 -
- 7 files changed, 35 insertions(+), 203 deletions(-)
+ 7 files changed, 37 insertions(+), 205 deletions(-)
 
 diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
 index 4170c32..d7dcda7 100644
@@ -67,10 +67,10 @@ index 4170c32..d7dcda7 100644
                          report.links_ignored_exception += 1;
                      } else {
 diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs
-index 264c113..2b0ff3a 100644
+index dd3fa8b..a088517 100644
 --- a/vendor/mdbook/src/book/init.rs
 +++ b/vendor/mdbook/src/book/init.rs
-@@ -151,12 +151,6 @@ impl BookBuilder {
+@@ -152,12 +152,6 @@ impl BookBuilder {
          let mut js = File::create(themedir.join("book.js"))?;
          js.write_all(theme::JS)?;
  
@@ -84,7 +84,7 @@ index 264c113..2b0ff3a 100644
      }
  
 diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-index b933a35..09b4a7a 100644
+index 1b648da..5fe813c 100644
 --- 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 crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition};
@@ -104,7 +104,7 @@ index b933a35..09b4a7a 100644
  
  use crate::utils::fs::get_404_output_file;
  use handlebars::Handlebars;
-@@ -232,80 +233,13 @@ impl HtmlHandlebars {
+@@ -235,80 +236,13 @@ impl HtmlHandlebars {
          if let Some(contents) = &theme.favicon_svg {
              write_file(destination, "favicon.svg", contents)?;
          }
@@ -191,10 +191,10 @@ index b933a35..09b4a7a 100644
          Ok(())
      }
 diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs
-index c3b944c..d4bbe35 100644
+index a9e2f5c..3e3f69c 100644
 --- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
 +++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
-@@ -52,8 +52,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
+@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
              format!("Object.assign(window.search, {});", index).as_bytes(),
          )?;
          utils::fs::write_file(destination, "searcher.js", searcher::JS)?;
@@ -204,10 +204,10 @@ index c3b944c..d4bbe35 100644
      }
  
 diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs
-index 18d984a..4a0e2d1 100644
+index 147eb9a..27d358b 100644
 --- a/vendor/mdbook/src/theme/index.hbs
 +++ b/vendor/mdbook/src/theme/index.hbs
-@@ -34,10 +34,7 @@
+@@ -33,10 +33,7 @@
          {{/if}}
  
          <!-- Fonts -->
@@ -219,21 +219,21 @@ index 18d984a..4a0e2d1 100644
  
          <!-- Highlight.js Stylesheets -->
          <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
-@@ -51,7 +48,7 @@
+@@ -50,7 +47,7 @@
  
          {{#if mathjax_support}}
          <!-- MathJax -->
--        <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-+        <script async type="text/javascript" src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
++        <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
          {{/if}}
      </head>
      <body>
-@@ -61,46 +58,6 @@
+@@ -60,46 +57,6 @@
              var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
          </script>
  
 -        <!-- Work around some values being stored in localStorage wrapped in quotes -->
--        <script type="text/javascript">
+-        <script>
 -            try {
 -                var theme = localStorage.getItem('mdbook-theme');
 -                var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -249,7 +249,7 @@ index 18d984a..4a0e2d1 100644
 -        </script>
 -
 -        <!-- Set the theme before any content is loaded, prevents flash -->
--        <script type="text/javascript">
+-        <script>
 -            var theme;
 -            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
 -            if (theme === null || theme === undefined) { theme = default_theme; }
@@ -261,7 +261,7 @@ index 18d984a..4a0e2d1 100644
 -        </script>
 -
 -        <!-- Hide / unhide sidebar before it is displayed -->
--        <script type="text/javascript">
+-        <script>
 -            var html = document.querySelector('html');
 -            var sidebar = 'hidden';
 -            if (document.body.clientWidth >= 1080) {
@@ -275,13 +275,13 @@ index 18d984a..4a0e2d1 100644
          <nav id="sidebar" class="sidebar" aria-label="Table of contents">
              <div class="sidebar-scrollbox">
                  {{#toc}}{{/toc}}
-@@ -238,52 +195,6 @@
+@@ -237,54 +194,8 @@
          </script>
          {{/if}}
  
 -        {{#if google_analytics}}
 -        <!-- Google Analytics Tag -->
--        <script type="text/javascript">
+-        <script>
 -            var localAddrs = ["localhost", "127.0.0.1", ""];
 -
 -            // make sure we don't activate google analytics if the developer is
@@ -299,37 +299,41 @@ index 18d984a..4a0e2d1 100644
 -        {{/if}}
 -
 -        {{#if playground_line_numbers}}
--        <script type="text/javascript">
+-        <script>
 -            window.playground_line_numbers = true;
 -        </script>
 -        {{/if}}
 -
 -        {{#if playground_copyable}}
--        <script type="text/javascript">
+-        <script>
 -            window.playground_copyable = true;
 -        </script>
 -        {{/if}}
 -
 -        {{#if playground_js}}
--        <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ path_to_root }}ace.js"></script>
+-        <script src="{{ path_to_root }}editor.js"></script>
+-        <script src="{{ path_to_root }}mode-rust.js"></script>
+-        <script src="{{ path_to_root }}theme-dawn.js"></script>
+-        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
 -        {{/if}}
 -
 -        {{#if search_js}}
--        <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
--        <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+-        <script src="{{ path_to_root }}mark.min.js"></script>
+-        <script src="{{ path_to_root }}searcher.js"></script>
 -        {{/if}}
 -
--        <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
-         <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
-         <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
+-        <script src="{{ path_to_root }}clipboard.min.js"></script>
+-        <script src="{{ path_to_root }}highlight.js"></script>
+-        <script src="{{ path_to_root }}book.js"></script>
++        <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
++        <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
  
+         <!-- Custom JS scripts -->
+         {{#each additional_js}}
 diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs
-index a1ee18a..d059f01 100644
+index 7af5e2b..3086fcf 100644
 --- a/vendor/mdbook/src/theme/mod.rs
 +++ b/vendor/mdbook/src/theme/mod.rs
 @@ -1,9 +1,5 @@
diff --git a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
index 9446070f0..d17b24beb 100644
--- a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
+++ b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
@@ -8,10 +8,10 @@ Subject: d-0003-cc-psm-rebuild-wasm32
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
-index a89e353..ccf99d2 100644
+index 486d67e..723b2e9 100644
 --- a/vendor/cc/src/lib.rs
 +++ b/vendor/cc/src/lib.rs
-@@ -2341,7 +2341,7 @@ impl Build {
+@@ -2369,7 +2369,7 @@ impl Build {
                      || target == "wasm32-unknown-wasi"
                      || target == "wasm32-unknown-unknown"
                  {
diff --git a/debian/patches/d-0004-clippy-feature-sync.patch b/debian/patches/d-0004-clippy-feature-sync.patch
index f92cfd4bd..086ece034 100644
--- a/debian/patches/d-0004-clippy-feature-sync.patch
+++ b/debian/patches/d-0004-clippy-feature-sync.patch
@@ -10,7 +10,7 @@ this is what rustc_workspace_hack does in the upstream build.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index 23beb15..ad8231a 100644
+index 3aa9ec6..0bb813d 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
 @@ -43,7 +43,7 @@ if_chain = "1.0"
diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch
index 235c93a50..baba25534 100644
--- a/debian/patches/d-bootstrap-cargo-doc-paths.patch
+++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch
@@ -241,3 +241,136 @@ index a22dc5f..c8d521a 100644
                      if is_exception(file, &target_pretty_path) {
                          report.links_ignored_exception += 1;
                      } else {
+Index: rust/compiler/rustc_error_codes/src/error_codes/E0462.md
+===================================================================
+--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0462.md
++++ rust/compiler/rustc_error_codes/src/error_codes/E0462.md
+@@ -26,7 +26,7 @@ prefer `staticlib` for linking with C pr
+ `crate_type`s in [this section of the Reference](../reference/linkage.html).
+ 
+ This error can be fixed by:
+- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
+    fixing this issue.
+  * Recompiling the crate as a `rlib` or `dylib`; formats suitable for Rust
+    linking.
+Index: rust/compiler/rustc_error_codes/src/error_codes/E0460.md
+===================================================================
+--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0460.md
++++ rust/compiler/rustc_error_codes/src/error_codes/E0460.md
+@@ -68,4 +68,4 @@ This error can be fixed by:
+  * Recompiling crate `a` so that both crate `b` and `main` have a uniform
+    version to depend on.
+ 
+-[Cargo]: ../cargo/index.html
++[Cargo]: ../../cargo-doc/doc/index.html
+Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md
+===================================================================
+--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0514.md
++++ rust/compiler/rustc_error_codes/src/error_codes/E0514.md
+@@ -27,7 +27,7 @@ the compiler cannot be sure about *how*
+ versions, and therefore this error occurs.
+ 
+ This error can be fixed by:
+- * Using [Cargo](../cargo/index.html), the Rust package manager and
++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager and
+    [Rustup](https://rust-lang.github.io/rustup/), the Rust toolchain installer,
+    automatically fixing this issue.
+  * Recompiling the crates with a uniform `rustc` version.
+Index: rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md
+===================================================================
+--- rust.orig/src/doc/unstable-book/src/compiler-flags/branch-protection.md
++++ rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md
+@@ -15,4 +15,4 @@ For example, `-Z branch-protection=bti,p
+ 
+ Rust's standard library does not ship with BTI or pointer authentication enabled by default.
+ In Cargo projects the standard library can be recompiled with pointer authentication using the nightly
+-[build-std](../../cargo/reference/unstable.html#build-std) feature.
++[build-std](../../../cargo-doc/doc/reference/unstable.html#build-std) feature.
+Index: rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
+===================================================================
+--- rust.orig/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
++++ rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
+@@ -39,7 +39,7 @@ It is strongly recommended to also enabl
+ 
+ To enable CFG in the standard library, use the [cargo `-Z build-std` functionality][build-std] to recompile the standard library with the same configuration options as the main program.
+ 
+-[build-std]: ../../cargo/reference/unstable.html#build-std
++[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std
+ 
+ For example:
+ ```cmd
+Index: rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
+===================================================================
+--- rust.orig/src/doc/unstable-book/src/compiler-flags/sanitizer.md
++++ rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
+@@ -691,7 +691,7 @@ It is strongly recommended to combine sa
+ instrumented standard library, for example using [cargo `-Zbuild-std`
+ functionality][build-std].
+ 
+-[build-std]: ../../cargo/reference/unstable.html#build-std
++[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std
+ 
+ # Build scripts and procedural macros
+ 
+Index: rust/compiler/rustc_error_codes/src/error_codes/E0461.md
+===================================================================
+--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0461.md
++++ rust/compiler/rustc_error_codes/src/error_codes/E0461.md
+@@ -25,6 +25,6 @@ architectures. This issue also extends t
+ `std` is operating-system specific.
+ 
+ This error can be fixed by:
+- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
+    fixing this issue.
+  * Recompiling either crate so that they target a consistent target triple.
+Index: rust/compiler/rustc_error_codes/src/error_codes/E0519.md
+===================================================================
+--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0519.md
++++ rust/compiler/rustc_error_codes/src/error_codes/E0519.md
+@@ -34,7 +34,7 @@ The above example compiles two crates wi
+ impossible for the compiler to distinguish between symbols (`pub` item names).
+ 
+ This error can be fixed by:
+- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
+    fixing this issue.
+  * Recompiling the crate with different metadata (different name/
+    `crate_type`).
+Index: rust/src/doc/rustc/src/linker-plugin-lto.md
+===================================================================
+--- rust.orig/src/doc/rustc/src/linker-plugin-lto.md
++++ rust/src/doc/rustc/src/linker-plugin-lto.md
+@@ -112,7 +112,7 @@ targeting Windows-like targets
+ This is fixed if you explicitly set the target, for example
+ `cargo build --target x86_64-pc-windows-msvc`
+ Without an explicit --target the flags will be passed to all compiler invocations (including build
+-scripts and proc macros), see [cargo docs on rustflags](../cargo/reference/config.html#buildrustflags)
++scripts and proc macros), see [cargo docs on rustflags](../../cargo-doc/doc/reference/config.html#buildrustflags)
+ 
+ If you have dependencies using the `cc` crate, you will need to set these
+ environment variables:
+Index: rust/src/doc/rustc/src/platform-support/fuchsia.md
+===================================================================
+--- rust.orig/src/doc/rustc/src/platform-support/fuchsia.md
++++ rust/src/doc/rustc/src/platform-support/fuchsia.md
+@@ -870,7 +870,7 @@ ${SDK_PATH}/tools/${ARCH}/ffx debug conn
+ [Fuchsia]: https://fuchsia.dev/
+ [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
+ [rustup]: https://rustup.rs/
+-[cargo]: ../../cargo/index.html
++[cargo]: ../../../cargo-doc/doc/index.html
+ [Fuchsia SDK]: https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
+ [overview of CML]: https://fuchsia.dev/fuchsia-src/concepts/components/v2/component_manifests
+ [reference for the file format]: https://fuchsia.dev/reference/cml
+Index: rust/src/doc/rustc/src/targets/custom.md
+===================================================================
+--- rust.orig/src/doc/rustc/src/targets/custom.md
++++ rust/src/doc/rustc/src/targets/custom.md
+@@ -14,4 +14,4 @@ To see it for a different target, add th
+ rustc +nightly -Z unstable-options --target=wasm32-unknown-unknown --print target-spec-json
+ ```
+ 
+-To use a custom target, see the (unstable) [`build-std` feature](../../cargo/reference/unstable.html#build-std) of `cargo`.
++To use a custom target, see the (unstable) [`build-std` feature](../../../cargo-doc/doc/reference/unstable.html#build-std) of `cargo`.
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
index 955b1e905..21aaf1f6b 100644
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
@@ -23,10 +23,10 @@ Subject: d-bootstrap-custom-debuginfo-path
          }
      }
  
-diff --git a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+diff --git a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
 index b66abc6..f6efe1e 100644
---- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
-+++ b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+--- a/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
++++ b/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
 @@ -7,7 +7,7 @@
  // true automatically. If paths to std library hasn't been remapped, we use the
  // above simulate-remapped-rust-src-base option to do it temporarily
diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
index 2c09c60c9..8c1625e6c 100644
--- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
+++ b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
@@ -49,8 +49,8 @@ index e0d5f6f..57ad8c4 100644
          target_features = []
          if self.get_toml("crt-static", build_section) == "true":
              target_features += ["+crt-static"]
---- a/src/test/assembly/asm/mips-types.rs
-+++ b/src/test/assembly/asm/mips-types.rs
+--- a/tests/assembly/asm/mips-types.rs
++++ b/tests/assembly/asm/mips-types.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
  // revisions: mips32 mips64
diff --git a/debian/patches/d-rustdoc-disable-embedded-fonts.patch b/debian/patches/d-rustdoc-disable-embedded-fonts.patch
index 5ec7bacb6..3213db6a5 100644
--- a/debian/patches/d-rustdoc-disable-embedded-fonts.patch
+++ b/debian/patches/d-rustdoc-disable-embedded-fonts.patch
@@ -24,8 +24,8 @@ Subject: d-rustdoc-disable-embedded-fonts
 -}
 -
  * {
- 	-webkit-box-sizing: border-box;
- 	-moz-box-sizing: border-box;
+ 	box-sizing: border-box;
+ }
 --- a/src/librustdoc/html/static_files.rs
 +++ b/src/librustdoc/html/static_files.rs
 @@ -126,8 +126,6 @@
diff --git a/debian/patches/d-test-ignore-avx-44056.patch b/debian/patches/d-test-ignore-avx-44056.patch
index c399e32f6..5448b7ad5 100644
--- a/debian/patches/d-test-ignore-avx-44056.patch
+++ b/debian/patches/d-test-ignore-avx-44056.patch
@@ -9,10 +9,10 @@ Bug: https://github.com/rust-lang/rust/pull/55667
  src/test/ui/issues/issue-44056.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/test/ui/issues/issue-44056.rs b/src/test/ui/issues/issue-44056.rs
+diff --git a/tests/ui/issues/issue-44056.rs b/tests/ui/issues/issue-44056.rs
 index a4903ed..ebe8402 100644
---- a/src/test/ui/issues/issue-44056.rs
-+++ b/src/test/ui/issues/issue-44056.rs
+--- a/tests/ui/issues/issue-44056.rs
++++ b/tests/ui/issues/issue-44056.rs
 @@ -1,5 +1,5 @@
  // build-pass (FIXME(55996): should be run on targets supporting avx)
 -// only-x86_64
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch
index a9dd0fee0..2b170977c 100644
--- a/debian/patches/u-fix-get-toml-when-test.patch
+++ b/debian/patches/u-fix-get-toml-when-test.patch
@@ -8,28 +8,29 @@ Last-Update: 2023-03-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -907,9 +907,9 @@
- 
-         config.stage0_metadata = t!(serde_json::from_slice::<Stage0Metadata>(&stage0_json));
+@@ -823,9 +823,9 @@
+     }
  
+     pub fn parse(args: &[String]) -> Config {
 -        #[cfg(test)]
 +        /*#[cfg(test)]
-         let get_toml = |_| TomlConfig::default();
+         let get_toml = |_: &_| TomlConfig::default();
 -        #[cfg(not(test))]
 +        #[cfg(not(test))]*/
          let get_toml = |file: &Path| {
              let contents =
                  t!(fs::read_to_string(file), format!("config file {} not found", file.display()));
-@@ -907,7 +907,22 @@
+@@ -834,7 +834,23 @@
              match toml::from_str(&contents)
                  .and_then(|table: toml::Value| TomlConfig::deserialize(table))
              {
 -                Ok(table) => table,
-+                /// Debian: We use previous version as a custom rustc, which unfortunately won't be
-+                /// picked up because config.toml isn't read when cfg!(test). Making tests use the
-+                /// entirety of our config.toml isn't feasible either as it panicks on GitRepo::Llvm
-+                /// (d-bootstrap-custom-debuginfo-path.patch), so only give paths of initial rustc
-+                /// and cargo.
++                // Debian: We use previous version as a custom rustc, which
++                // unfortunately won't be picked up because config.toml isn't
++                // read when cfg!(test). Making tests use the entirety of our
++                // config.toml isn't feasible either as it panicks on
++                // GitRepo::Llvm (d-bootstrap-custom-debuginfo-path.patch), so
++                // only give paths of initial rustc and cargo.
 +                Ok(table) => if !cfg!(test) || table.build.is_none() {
 +                    table
 +                } else {
diff --git a/debian/patches/u-ignore-endian-big-diff.patch b/debian/patches/u-ignore-endian-big-diff.patch
index aec8c5255..73bb776c3 100644
--- a/debian/patches/u-ignore-endian-big-diff.patch
+++ b/debian/patches/u-ignore-endian-big-diff.patch
@@ -14,45 +14,45 @@ Bug: https://github.com/rust-lang/rust/issues/89577
  src/test/ui/consts/const-eval/ub-wide-ptr.rs  | 1 +
  6 files changed, 6 insertions(+)
 
---- a/src/test/ui/consts/const-eval/ub-enum.rs
-+++ b/src/test/ui/consts/const-eval/ub-enum.rs
+--- a/tests/ui/consts/const-eval/ub-enum.rs
++++ b/tests/ui/consts/const-eval/ub-enum.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
  // stderr-per-bitwidth
- #![feature(never_type)]
- #![allow(invalid_value)]
---- a/src/test/ui/consts/const-eval/ub-int-array.rs
-+++ b/src/test/ui/consts/const-eval/ub-int-array.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+--- a/tests/ui/consts/const-eval/ub-int-array.rs
++++ b/tests/ui/consts/const-eval/ub-int-array.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
  // stderr-per-bitwidth
  //! Test the "array of int" fast path in validity checking, and in particular whether it
  //! points at the right array element.
---- a/src/test/ui/consts/const-eval/ub-nonnull.rs
-+++ b/src/test/ui/consts/const-eval/ub-nonnull.rs
+--- a/tests/ui/consts/const-eval/ub-nonnull.rs
++++ b/tests/ui/consts/const-eval/ub-nonnull.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
- // stderr-per-bitwidth
- #![feature(rustc_attrs, ptr_metadata)]
- #![allow(invalid_value)] // make sure we cannot allow away the errors tested here
---- a/src/test/ui/consts/const-eval/ub-ref-ptr.rs
-+++ b/src/test/ui/consts/const-eval/ub-ref-ptr.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+ // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+--- a/tests/ui/consts/const-eval/ub-ref-ptr.rs
++++ b/tests/ui/consts/const-eval/ub-ref-ptr.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
  // ignore-tidy-linelength
- // stderr-per-bitwidth
- #![allow(invalid_value)]
---- a/src/test/ui/consts/const-eval/ub-uninhabit.rs
-+++ b/src/test/ui/consts/const-eval/ub-uninhabit.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+--- a/tests/ui/consts/const-eval/ub-uninhabit.rs
++++ b/tests/ui/consts/const-eval/ub-uninhabit.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
- // stderr-per-bitwidth
- 
- use std::mem;
---- a/src/test/ui/consts/const-eval/ub-wide-ptr.rs
-+++ b/src/test/ui/consts/const-eval/ub-wide-ptr.rs
+ // Strip out raw byte dumps to make comparison platform-independent:
+ // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
+ // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
+--- a/tests/ui/consts/const-eval/ub-wide-ptr.rs
++++ b/tests/ui/consts/const-eval/ub-wide-ptr.rs
 @@ -1,3 +1,4 @@
 +// ignore-test
- // stderr-per-bitwidth
  // ignore-tidy-linelength
  #![allow(unused)]
+ 
diff --git a/debian/patches/u-ignore-reproducible-failure.patch b/debian/patches/u-ignore-reproducible-failure.patch
index e0f9688b3..6ea14023d 100644
--- a/debian/patches/u-ignore-reproducible-failure.patch
+++ b/debian/patches/u-ignore-reproducible-failure.patch
@@ -7,10 +7,10 @@ Bug: https://github.com/rust-lang/rust/issues/89911
  src/test/run-make-fulldeps/reproducible-build-2/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/test/run-make-fulldeps/reproducible-build-2/Makefile b/src/test/run-make-fulldeps/reproducible-build-2/Makefile
+diff --git a/tests/run-make-fulldeps/reproducible-build-2/Makefile b/tests/run-make-fulldeps/reproducible-build-2/Makefile
 index fd94516..957e1f4 100644
---- a/src/test/run-make-fulldeps/reproducible-build-2/Makefile
-+++ b/src/test/run-make-fulldeps/reproducible-build-2/Makefile
+--- a/tests/run-make-fulldeps/reproducible-build-2/Makefile
++++ b/tests/run-make-fulldeps/reproducible-build-2/Makefile
 @@ -14,7 +14,7 @@ fat_lto:
  	$(RUSTC) reproducible-build.rs -C lto=fat
  	cp $(TMPDIR)/reproducible-build $(TMPDIR)/reproducible-build-a
diff --git a/debian/patches/u-make-tests-work-without-rpath.patch b/debian/patches/u-make-tests-work-without-rpath.patch
index 97cd89233..edd2127a9 100644
--- a/debian/patches/u-make-tests-work-without-rpath.patch
+++ b/debian/patches/u-make-tests-work-without-rpath.patch
@@ -9,10 +9,10 @@ Forwarded: TODO
  src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 index 1e267fb..ac46c24 100644
---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+--- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
++++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,2 +1,6 @@
 +include ../tools.mk
 +
diff --git a/debian/patches/u-rustc-llvm-cross-flags.patch b/debian/patches/u-rustc-llvm-cross-flags.patch
index 6ee382aba..226485b08 100644
--- a/debian/patches/u-rustc-llvm-cross-flags.patch
+++ b/debian/patches/u-rustc-llvm-cross-flags.patch
@@ -7,8 +7,6 @@ Subject: u-rustc-llvm-cross-flags
  compiler/rustc_llvm/build.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
-index b8f67ee..e9b1d0a 100644
 --- a/compiler/rustc_llvm/build.rs
 +++ b/compiler/rustc_llvm/build.rs
 @@ -304,7 +304,7 @@
@@ -19,4 +17,4 @@ index b8f67ee..e9b1d0a 100644
 +                if stripped.contains(&host) { println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); }
              }
          } else if let Some(stripped) = lib.strip_prefix("-LIBPATH:") {
-             println!("cargo:rustc-link-search=native={}", stripped);
+             println!("cargo:rustc-link-search=native={stripped}");
diff --git a/debian/rules b/debian/rules
index 97f2f071d..460e55720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,13 @@ SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc:nat
 LOCAL_RUST_VERSION := $(shell rustc --version --verbose | sed -ne 's/^release: //p')
 
 include /usr/share/dpkg/buildflags.mk
-export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+# needed for cross-compilation to avoid passing host CFLAGS to the BUILD
+# compiler
+export TARGET_CFLAGS = $(CFLAGS)
+export TARGET_CXXFLAGS = $(CXXFLAGS)
+export TARGET_CPPFLAGS = $(CPPFLAGS)
+export TARGET_LDFLAGS = $(LDFLAGS)
+unexport CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 export CARGO_HOME = $(CURDIR)/debian/cargo
 
 # Defines DEB_*_RUST_TYPE triples
@@ -403,7 +409,7 @@ ifeq (true,$(BUILD_DOCS))
 	  topdir=$$(echo "$$file" | sed 's,^$(DEB_DESTDIR)/usr/share/doc/rust/html/,,; s,/[^/]*$$,/,; s,^[^/]*$$,,; s,[^/]\+/,../,g'); \
 	  sed -i \
 	    -e "s,https://\(doc\|www\).rust-lang.org/\(favicon.ico\|logos/rust-logo-32x32-blk.png\),$${topdir}rust-logo-32x32-blk.png," \
-	    -e 's,<img src="https://github.com/rust-lang/rust-clippy/workflows/Clippy%20Test/badge.svg[^"]*" alt="\([^"]*\)" />,<span class="deb-privacy-replace--github.com-badge">\1</span>,g' \
+	    -e 's,<img src="https://github.com/rust-lang/rust-clippy/workflows/Clippy%20Test%20(bors)/badge.svg[^"]*" alt="\([^"]*\)" />,<span class="deb-privacy-replace--github.com-badge">\1</span>,g' \
 	    -e 's,<img src="https://img.shields.io/[^"]*" alt="\([^"]*\)" />,<span class="deb-privacy-replace--shields-io">\1</span>,g' "$$file"; \
 	done
 	find $(DEB_DESTDIR) \( -iname '*.html' -empty -o -name .lock -o -name '*.inc' \) -delete;
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 462037bf0..883fb4fae 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,9 +2,9 @@
 rustc source: source-is-missing [library/stdarch/crates/stdarch-verify/arm-intrinsics.html]
 # Test data
 rustc source: source-is-missing [src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/*.html]
-rustc source: source-is-missing [src/test/rustdoc/decl-trailing-whitespace.declaration.html]
-rustc source: source-is-missing [src/test/rustdoc/doc-notable_trait*.html]
-rustc source: source-is-missing [src/test/rustdoc/spotlight*.html]
+rustc source: source-is-missing [tests/rustdoc/decl-trailing-whitespace.declaration.html]
+rustc source: source-is-missing [tests/rustdoc/doc-notable_trait*.html]
+rustc source: source-is-missing [tests/rustdoc/spotlight*.html]
 rustc source: source-is-missing [vendor/html5ever/data/bench/*.html]
 rustc source: source-is-missing [vendor/minifier/tests/files/minified_main.js]
 rustc source: source-contains-prebuilt-windows-binary [vendor/libloading/tests/nagisa32.dll]
diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
index c31475a87..4cc8b41d0 100644
--- a/debian/upstream-tarball-unsuspicious.txt
+++ b/debian/upstream-tarball-unsuspicious.txt
@@ -10,8 +10,7 @@ src/doc/reference/src/crates-and-source-files.md
 src/doc/reference/src/items/extern-crates.md
 src/doc/reference/src/items/modules.md
 src/doc/reference/src/types-redirect.html
-vendor/chalk-solve/src/infer/test.rs
-vendor/getrandom-0.1.16/src/wasm32_stdweb.rs
+vendor/chalk-solve-0.87.0/src/infer/test.rs
 vendor/itertools*/examples/iris.data
 vendor/minifier/src/js/tools.rs
 vendor/regex/tests/suffix_reverse.rs
@@ -24,13 +23,15 @@ CONTRIBUTING.md
 RELEASES.md
 compiler/rustc_codegen_cranelift/docs/dwarf.md
 compiler/rustc_codegen_gcc/Readme.md
+compiler/rustc_error_messages/locales/en-US/codegen_ssa.ftl
 library/core/src/ffi/c_*.md
 library/portable-simd/*.md
-library/std/src/sys/sgx/abi/entry.S
 library/stdarch/CONTRIBUTING.md
 library/stdarch/crates/core_arch/src/aarch64/neon/generated.rs
-src/doc/*/CODE_OF_CONDUCT.md
+library/std/src/sys/sgx/abi/entry.S
+src/bootstrap/CHANGELOG.md
 src/doc/book/first-edition/src/the-stack-and-the-heap.md
+src/doc/*/CODE_OF_CONDUCT.md
 src/doc/edition-guide/src/rust-2018/index.md
 src/doc/edition-guide/src/rust-2021/disjoint-capture-in-closures.md
 src/doc/edition-guide/src/rust-2021/prelude.md
@@ -47,53 +48,65 @@ src/doc/rustc-dev-guide/src/*/*.md
 src/doc/rustc/src/instrument-coverage.md
 src/doc/rustc/src/lints/groups.md
 src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md
-src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md
+src/doc/rustc/src/platform-support/armv7-sony-vita-eabihf.md
 src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md
+src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md
 src/doc/rustc/src/targets/known-issues.md
 src/doc/rustdoc/src/*.md
 src/doc/unstable-book/src/*/*.md
 src/etc/third-party/README.txt
 src/librustdoc/html/highlight/fixtures/sample.html
 src/librustdoc/html/static/scrape-examples-help.md
-src/test/rustdoc/inline_cross/assoc_item_trait_bounds.out*.html
-src/test/rustdoc-gui/src/huge_logo/src/lib.rs
-src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs
 src/tools/rust-analyzer/crates/ide-completion/src/completions/env_vars.rs
+src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs
 src/tools/rust-analyzer/docs/user/manual.adoc
 src/tools/rustfmt/*.md
-vendor/*/*/*/LICENSE
-vendor/*/*/LICENSE
-vendor/*/CHANGELOG.md
-vendor/*/CODE_OF_CONDUCT.md
-vendor/*/Cargo.toml
-vendor/*/LICENSE
-vendor/*/LICENSE-MIT
-vendor/*/README.md
+tests/mir-opt/building/*.mir
+tests/mir-opt/coverage_graphviz.*.InstrumentCoverage.0.dot
+tests/mir-opt/inline/inline_generator.main.Inline.diff
+tests/rustdoc/inline_cross/assoc_item_trait_bounds.out*.html
+tests/rustdoc-ui/z-help.stdout
+tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
+vendor/ahash-0.7.6/FAQ.md
 vendor/ahash/FAQ.md
 vendor/ammonia/src/lib.rs
+vendor/*/Cargo.toml
+vendor/*/CHANGELOG.md
 vendor/clap-*/examples/demo.md
 vendor/clap-*/examples/tutorial_*/*.md
+vendor/*/CODE_OF_CONDUCT.md
 vendor/generic-array/DESIGN.md
 vendor/handlebars/src/lib.rs
 vendor/handlebars/src/render.rs
 vendor/handlebars/src/template.rs
 vendor/lazy_static/src/lib.rs
+vendor/*/*/*/LICENSE
+vendor/*/*/LICENSE
+vendor/*/LICENSE
+vendor/*/LICENSE-MIT
 vendor/maplit/README.rst
 vendor/mdbook/CONTRIBUTING.md
 vendor/miniz_oxide/Readme.md
 vendor/pulldown-cmark/tests/suite/footnotes.rs
+vendor/*/README.md
 vendor/rustc-demangle/src/legacy.rs
 vendor/spdx-expression/LICENSES/MIT.txt
-vendor/spdx-rs/LICENSE.txt
 vendor/spdx-rs/LICENSES/MIT.txt
-vendor/spdx-rs/src/models/*.rs
+vendor/spdx-rs/LICENSE.txt
+vendor/spdx-rs/src/models/file_information.rs
+vendor/spdx-rs/src/models/other_licensing_information_detected.rs
+vendor/spdx-rs/src/models/package_information.rs
 vendor/stable_deref_trait/src/lib.rs
 vendor/tinyvec/LICENSE-*.md
 vendor/tracing-subscriber-*/src/fmt/format/json.rs
 vendor/unicase/src/lib.rs
 vendor/unicode-normalization/src/stream_safe.rs
 vendor/winapi/src/lib.rs
-vendor/windows-sys/readme.md
+vendor/windows-sys-0.*/src/Windows/Win32/*.rs
+vendor/windows-sys-0.*/src/Windows/Win32/*/*.rs
+vendor/windows-sys-0.*/src/Windows/Win32/*/*/*.rs
+vendor/windows-sys-0.*/src/Windows/Win32/*/*/*/*.rs
+vendor/windows-sys*/readme.md
 vendor/windows-sys/src/Windows/Win32/*.rs
 vendor/windows-sys/src/Windows/Win32/*/*.rs
 vendor/windows-sys/src/Windows/Win32/*/*/*.rs
@@ -111,12 +124,6 @@ src/doc/rustc-dev-guide/mermaid-init.js
 src/etc/wasm32-shim.js
 src/librustdoc/html/static/.eslintrc.js
 src/librustdoc/html/static/js/*.js
-src/test/auxiliary/rust_test_helpers.c
-src/test/run-make-fulldeps/*/*.c
-src/test/run-make/*/*.c
-src/test/run-make/wasm-*/*.js
-src/test/rustdoc-js-std/*.js
-src/test/rustdoc-js/*.js
 src/tools/error_index_generator/*.js
 src/tools/rustdoc-gui/tester.js
 src/tools/rustdoc-js/tester.js
@@ -139,34 +146,30 @@ vendor/stacker/src/arch/windows.c
 # False-positive, misc
 src/doc/rustc-dev-guide/src/queries/example-0.counts.txt
 src/stage0.json
-src/test/run-make-fulldeps/target-specs/*.json
 src/tools/clippy/.remarkrc
 vendor/elasticlunr-rs/src/lang/*.rs
-vendor/icu_locid/tests/fixtures/*.json
-vendor/icu_locid/benches/fixtures/*.json
 
 # False-positive, hand-editable small image
+src/doc/book/2018-edition/src/img/ferris/*.svg
 src/doc/book/2018-edition/src/img/*.png
 src/doc/book/2018-edition/src/img/*.svg
-src/doc/book/2018-edition/src/img/ferris/*.svg
 src/doc/book/second-edition/src/img/*.png
 src/doc/book/second-edition/src/img/*.svg
+src/doc/book/src/img/ferris/*.svg
 src/doc/book/src/img/*.png
 src/doc/book/src/img/*.svg
-src/doc/book/src/img/ferris/*.svg
 src/doc/book/tools/docx-to-md.xsl
+src/doc/embedded-book/src/assets/f3.jpg
 src/doc/embedded-book/src/assets/*.png
 src/doc/embedded-book/src/assets/*.svg
-src/doc/embedded-book/src/assets/f3.jpg
 src/doc/embedded-book/src/assets/verify.jpeg
 src/doc/nomicon/src/img/safeandunsafe.svg
 src/doc/rustc-dev-guide/src/img/*.png
 src/doc/rustc-dev-guide/src/queries/example-0.png
 src/doc/rustc/src/images/*.png
 src/etc/installer/gfx/
-src/librustdoc/html/static/images/*.svg
 src/librustdoc/html/static/images/favicon-*.png
-src/test/mir-opt/coverage_graphviz.*.InstrumentCoverage.0.dot
+src/librustdoc/html/static/images/*.svg
 src/tools/rust-analyzer/assets/logo-*.svg
 vendor/mdbook/src/theme/favicon.png
 vendor/mdbook/src/theme/favicon.svg
@@ -181,34 +184,13 @@ library/core/benches/str.rs
 library/core/tests/num/dec2flt/parse.rs
 library/portable-simd/crates/core_simd/tests/mask_ops_impl/*.rs
 library/portable-simd/crates/core_simd/webdriver.json
-library/std/src/sys/windows/path/tests.rs
 library/stdarch/ci/gba.json
-library/stdarch/crates/std_detect/src/detect/test_data/*.auxv
 library/stdarch/crates/stdarch-verify/arm-intrinsics.html
 library/stdarch/crates/stdarch-verify/x86-intel.xml
-src/test/*/*.rs
-src/test/*/*.stderr
-src/test/*/*.stdout
-src/test/*/*/*.json
-src/test/*/*/*.rs
-src/test/*/*/*.stderr
-src/test/*/*/*.stdout
-src/test/*/*/*/*.stderr
-src/test/*/*/*/*.stdout
-src/test/*/*/*/*/*.stderr
-src/test/*/*/issues/*.rs
-src/test/debuginfo/type-names.cdb.js
-src/test/mir-opt/*.diff
-src/test/mir-opt/*.mir
-src/test/mir-opt/*/*.diff
-src/test/mir-opt/*/*.mir
-src/test/run-make/*-sgx-lvi/enclave/*.c
-src/test/run-make/*-sgx-lvi/enclave/*/*/*.c
-src/test/rustdoc/*.html
-src/test/ui/macros/not-utf8.bin
-src/tools/*/tests/*/*.stderr
-src/tools/clippy/tests/ui-toml/*/*.stderr
+library/stdarch/crates/std_detect/src/detect/test_data/*.auxv
+library/std/src/sys/windows/path/tests.rs
 src/tools/clippy/tests/ui-toml/large_include_file/too_big.txt
+src/tools/clippy/tests/ui-toml/*/*.stderr
 src/tools/clippy/tests/ui/wildcard_enum_match_arm.fixed
 src/tools/rust-analyzer/bench_data/numerous_macro_rules
 src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_*.html
@@ -221,26 +203,52 @@ src/tools/rustfmt/tests/source/*/*.rs
 src/tools/rustfmt/tests/target/issue-5088/very_long_comment_wrap_comments_false.rs
 src/tools/rustfmt/tests/writemode/target/*.json
 src/tools/rustfmt/tests/writemode/target/*.xml
+src/tools/*/tests/*/*.stderr
+tests/auxiliary/rust_test_helpers.c
+tests/debuginfo/type-names.cdb.js
+tests/*/*.html
+tests/*/*/*.js
+tests/*/*/*.json
+tests/*/*.rs
+tests/*/*/*.rs
+tests/*/*/*/*.rs
+tests/run-make/*/*.c
+tests/run-make-fulldeps/*/*.c
+tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/foo.c
+tests/run-make/x86_64-fortanix-unknown-sgx-lvi/enclave/libcmake_foo/src/foo.c
+tests/rustdoc-gui/src/huge_logo/src/lib.rs
+tests/rustdoc-gui/src/scrape_examples/examples/check-many-*.rs
+tests/rustdoc-js/*.js
+tests/rustdoc-js-std/*.js
+tests/*/*.stderr
+tests/*/*/*.stderr
+tests/*/*/*.stdout
+tests/ui/macros/not-utf8.bin
+tests/ui/nll/*/*.stderr
+tests/ui/parser/issues/*.stderr
+tests/ui/proc-macro/debug/*.stderr
 vendor/annotate-snippets/tests/fixtures/no-color/strip_line_non_ws.toml
-vendor/bstr-0.*/src/unicode/data/*Test.txt
+vendor/bstr-0.2.17/src/unicode/fsm/*.dfa
 vendor/cargo_metadata*/tests/test_samples.rs
 vendor/diff/tests/data/gitignores.chars.diff
 vendor/dissimilar/benches/*.txt
 vendor/elasticlunr-rs/tests/data/*.in.txt
 vendor/elasticlunr-rs/tests/searchindex_fixture_*.json
-vendor/flate2/tests/*.gz
 vendor/flate2/tests/corrupt-gz-file.bin
+vendor/flate2/tests/*.gz
 vendor/fluent-syntax/benches/parser.rs
 vendor/gimli/fixtures/self/*
 vendor/gsgdt/tests/*.json
 vendor/handlebars/tests/helper_with_space.rs
 vendor/html5ever/data/bench/*.html
-vendor/icu_provider_adapters/tests/data/langtest/*/manifest.json
-vendor/icu_provider_adapters/tests/data/langtest/*/core/*/*.json
+vendor/icu_locid/benches/fixtures/*.json
+vendor/icu_locid/tests/fixtures/*.json
+vendor/icu_provider_adapters/tests/data/langtest/*/*.json
+vendor/icu_provider_adapters/tests/data/langtest/*/*/*/*.json
 vendor/idna/tests/IdnaTest*.txt
 vendor/idna/tests/punycode_tests.json
 vendor/libloading/tests/*.dll
-vendor/litemap/benches/testdata/*.postcard
+vendor/litemap/benches/testdata/large_litemap.postcard
 vendor/lsp-types/tests/tsc-unix.lsif
 vendor/md-5/tests/data/*.blb
 vendor/mdbook/test_book/src/individual/paragraph.md
@@ -253,16 +261,16 @@ vendor/minifier/tests/files/test.json
 vendor/minimal-lexical/tests/parse_tests.rs
 vendor/minimal-lexical/tests/slow_tests.rs
 vendor/petgraph/tests/res/*.txt
+vendor/regex-automata-0.1.10/data/fowler-tests/basic.dat
+vendor/regex-automata-0.1.10/data/tests/fowler/basic.dat
+vendor/regex-automata/tests/data/fowler/dat/basic.dat
 vendor/regex/src/testdata/basic.dat
 vendor/regex/tests/crates_regex.rs
 vendor/regex/tests/fowler.rs
-vendor/regex-automata-0.*/data/fowler-tests/basic.dat
-vendor/regex-automata-0.*/data/tests/fowler/basic.dat
-vendor/regex-automata/tests/data/fowler/dat/basic.dat
 vendor/rustc-demangle/src/lib.rs
 vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit
 vendor/serde_json/tests/lexical/parse.rs
-vendor/sha-1/tests/data/*.blb
+vendor/sha1/tests/data/sha1.blb
 vendor/sha2/tests/data/*.blb
 vendor/term/tests/data/*
 vendor/unicode-ident/tests/fst/*.fst
@@ -270,6 +278,7 @@ vendor/unicode-segmentation/src/testdata.rs
 vendor/url/tests/*.json
 vendor/walkdir/compare/nftw.c
 vendor/zerovec/benches/testdata/*.postcard
+vendor/zip/tests/data/*.zip
 
 # Compromise, ideally we'd autogenerate these
 # Should already by documented in debian/copyright
@@ -290,40 +299,45 @@ vendor/wasi/src/lib_generated.rs
 # Compromise, ideally we'd package these in their own package
 src/librustdoc/html/static/fonts/*.woff2
 
-# Compromise, ideally we'd autogenerate these
-vendor/bstr-0.*/src/unicode/fsm/*.dfa
-
 # file brokenness (detected as Algol source code)
 compiler/rustc_apfloat/src/lib.rs
 compiler/rustc_driver/src/lib.rs
 compiler/rustc_expand/src/mbe/quoted.rs
 compiler/rustc_macros/src/symbols/tests.rs
-library/std/src/sys/unix/process/process_unix.rs
+library/alloc/src/slice/tests.rs
 library/stdarch/crates/stdarch-verify/src/lib.rs
+library/std/src/sys/unix/process/process_unix.rs
 src/librustdoc/html/markdown/tests.rs
-src/test/run-make-fulldeps/symbol-visibility/Makefile
-src/test/ui/proc-macro/auxiliary/*.rs
 src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs
 src/tools/clippy/clippy_lints/src/pass_by_ref_or_value.rs
 src/tools/rust-analyzer/crates/ide-assists/src/handlers/number_representation.rs
 src/tools/rust-analyzer/crates/ide-db/src/syntax_helpers/format_string_exprs.rs
 src/tools/rustfmt/src/formatting.rs
+src/tools/rustfmt/src/lib.rs
 src/tools/rustfmt/src/parse/parser.rs
 src/tools/rustfmt/src/string.rs
+vendor/ahash-0.7.6/src/hash_quality_test.rs
+vendor/ahash-0.7.6/src/lib.rs
+vendor/ahash/src/fallback_hash.rs
 vendor/ahash/src/hash_quality_test.rs
 vendor/ahash/src/lib.rs
 vendor/aho-corasick/src/nfa.rs
 vendor/askama_shared/src/generator.rs
 vendor/block-buffer/tests/mod.rs
-vendor/clap-*/src/derive.rs
+vendor/clap*/src/derive.rs
+vendor/clap_derive/src/derives/args.rs
+vendor/clap_derive/src/derives/parser.rs
+vendor/clap_derive/src/derives/subcommand.rs
+vendor/clap_derive/src/derives/value_enum.rs
 vendor/compiler_builtins/libm/src/math/atan.rs
 vendor/datafrog/src/lib.rs
+vendor/derive_more/src/*.rs
 vendor/digest/src/core_api/rt_variable.rs
 vendor/digest/src/core_api/wrapper.rs
 vendor/digest/src/dev.rs
 vendor/displaydoc/src/expand.rs
-vendor/derive_more/src/*.rs
 vendor/env_logger-0.*/src/fmt/writer/mod.rs
+vendor/env_logger/src/fmt/writer/mod.rs
 vendor/flate2/src/mem.rs
 vendor/flate2/src/zio.rs
 vendor/futures-macro/src/lib.rs
@@ -363,17 +377,17 @@ vendor/nom/tests/issues.rs
 vendor/nom/tests/json.rs
 vendor/nom/tests/mp4.rs
 vendor/nom/tests/multiline.rs
+vendor/pest_generator/src/generator.rs
 vendor/pest/src/parser_state.rs
 vendor/pest/src/position.rs
 vendor/pest/src/span.rs
 vendor/pest/tests/calculator.rs
-vendor/pest_generator/src/generator.rs
 vendor/proc-macro2/src/parse.rs
 vendor/pulldown-cmark/benches/html_rendering.rs
 vendor/pulldown-cmark/src/linklabel.rs
 vendor/pulldown-cmark/tests/lib.rs
 vendor/rayon/tests/sort-panic-safe.rs
-vendor/regex-automata-0.*/src/regex.rs
+vendor/regex-automata-0.1.10/src/regex.rs
 vendor/rustc-rayon/tests/sort-panic-safe.rs
 vendor/rustversion/src/attr.rs
 vendor/rustversion/src/lib.rs
@@ -388,17 +402,25 @@ vendor/syn/src/custom_punctuation.rs
 vendor/syn/src/data.rs
 vendor/syn/src/derive.rs
 vendor/syn/src/group.rs
-vendor/syn/src/pat.rs
 vendor/syn/src/path.rs
+vendor/syn/src/pat.rs
 vendor/syn/src/punctuated.rs
 vendor/syn/src/stmt.rs
 vendor/syn/src/token.rs
 vendor/syn/src/ty.rs
 vendor/syn/tests/test_meta.rs
 vendor/thiserror-impl/src/attr.rs
+vendor/time/src/parsing/combinator/mod.rs
+vendor/time/src/parsing/combinator/rfc/*.rs
+vendor/time/src/parsing/*.rs
 vendor/url/src/parser.rs
 vendor/utf-8/benches/from_utf8_lossy.rs
 vendor/utf-8/tests/unit.rs
 vendor/xz2/src/bufread.rs
 vendor/xz2/src/stream.rs
 vendor/yansi/src/tests.rs
+
+# file brokenness (detected as Dyalog APL transfer)
+vendor/clap/examples/demo.md
+vendor/clap/examples/tutorial_builder/*.md
+vendor/clap/examples/tutorial_derive/*.md