16 files changed, 184 insertions, 141 deletions
diff --git a/debian/changelog b/debian/changelog
index 6d8341f9f..12e74af57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+rustc (1.69.0+dfsg1-1) unstable; urgency=medium
+
+  * Upload to unstable
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 13 Sep 2023 13:57:58 +0200
+
+rustc (1.69.0+dfsg1-1~exp2) experimental; urgency=medium
+
+  * config: also enable rustdoc explicitly
+  * bump wasi-libc to revert stack protection (Closes: #1051815)
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 13 Sep 2023 08:02:53 +0200
+
+rustc (1.69.0+dfsg1-1~exp1) experimental; urgency=medium
+
+  [ Eric Long ]
+  * New upstream release
+  * Manually include `rust-analyzer-proc-macro-srv` (again)
+
+  [ Fabian Grünbichler ]
+  * add libc with "extra_traits" to feature sync patch
+  * update d/copyright
+  * update lintian overrides
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 12 Sep 2023 10:17:15 +0200
+
 rustc (1.68.2+dfsg1-1) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/config.toml.in b/debian/config.toml.in
index 899d8ebeb..f896f97dc 100644
--- a/debian/config.toml.in
+++ b/debian/config.toml.in
@@ -22,7 +22,7 @@ target = ["DEB_TARGET_RUST_TYPE"]
 docs = false
 
 extended = true
-tools = ["clippy", "rustfmt"]
+tools = ["clippy", "rustfmt", "rustdoc", "rust-analyzer-proc-macro-srv"]
 
 [install]
 prefix = "/usr"
diff --git a/debian/control b/debian/control
index 206abda48..4beb71c2f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  dpkg-dev (>= 1.17.14),
  python3:native,
  cargo:native (>= 0.60.0)      <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.67.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.68.2++)    <!pkg.rustc.dlstage0>,
+ rustc:native (>= 1.68.0+dfsg) <!pkg.rustc.dlstage0>,
+ rustc:native (<= 1.69.0++)    <!pkg.rustc.dlstage0>,
  llvm-15-dev:native,
  llvm-15-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
@@ -39,7 +39,7 @@ Build-Depends:
  curl <pkg.rustc.dlstage0>,
  ca-certificates <pkg.rustc.dlstage0>,
 Build-Depends-Indep:
- wasi-libc (>= 0.0~git20230113.4362b18~~) <!nowasm>,
+ wasi-libc (>= 0.0~git20230113.4362b18-2~) <!nowasm>,
  wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
  clang-15:native,
 Build-Conflicts: gdb-minimal <!nocheck>
@@ -56,7 +56,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends:
- cargo (>= 0.69.0~~), cargo (<< 0.70.0~~),
+ cargo (>= 0.70.0~~), cargo (<< 0.71.0~~),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
  llvm-15,
 Suggests:
@@ -77,7 +77,7 @@ Description: Rust systems programming language
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.68
+Package: libstd-rust-1.69
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -104,7 +104,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.68 (= ${binary:Version}),
+ libstd-rust-1.69 (= ${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
@@ -267,7 +267,7 @@ Package: rust-clippy
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.68 (= ${binary:Version})
+ libstd-rust-1.69 (= ${binary:Version})
 Recommends: cargo
 Description: Rust linter
  Rust is a curly-brace, block-structured expression language.  It
@@ -322,7 +322,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
  rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
  cargo,
 Recommends:
- cargo (>= 0.69.0~~), cargo (<< 0.70.0~~)
+ cargo (>= 0.70.0~~), cargo (<< 0.71.0~~)
 Suggests:
  rust-doc (>= ${binary:Version}),
  rust-src (>= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index 873a9fc7e..dab084da3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,14 +41,19 @@ Files-Excluded:
  vendor/winapi-*/*/*.a
 # Embedded submodule used for CI
  library/stdarch/crates/intrinsic-test/acle
+# .profraw file, probably imported by mistake
+ src/tools/rust-analyzer/crates/rust-analyzer/default_12483297303756020505_0.profraw
 # unused dependencies, generated by debian/prune-unused-deps
 # DO NOT EDIT below, AUTOGENERATED
  vendor/ahash-0.7.4
- vendor/ansi_term-0.11.0
+ vendor/ansi_term
  vendor/anyhow-1.0.65
+ vendor/anyhow-1.0.66
  vendor/anymap
  vendor/arbitrary
+ vendor/arrayvec-0.5.2
  vendor/arrayvec-0.7.0
+ vendor/backtrace-0.3.66
  vendor/base16ct
  vendor/base64
  vendor/base64ct
@@ -57,14 +62,15 @@ Files-Excluded:
  vendor/bumpalo
  vendor/bytesize
  vendor/camino-1.0.9
+ vendor/cargo_metadata-0.15.2
  vendor/cc-1.0.73
+ vendor/cc-1.0.77
  vendor/chalk-derive
  vendor/chalk-ir
  vendor/chalk-recursive
  vendor/chalk-solve
  vendor/color-eyre
  vendor/color-spantrace
- vendor/combine
  vendor/command-group
  vendor/commoncrypto
  vendor/commoncrypto-sys
@@ -78,7 +84,6 @@ 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
@@ -86,8 +91,6 @@ Files-Excluded:
  vendor/cranelift-module
  vendor/cranelift-native
  vendor/cranelift-object
- vendor/crossbeam-epoch-0.9.11
- vendor/crossbeam-utils-0.8.12
  vendor/crypto-bigint
  vendor/crypto-common-0.1.3
  vendor/crypto-hash
@@ -98,9 +101,9 @@ Files-Excluded:
  vendor/der
  vendor/derive_arbitrary
  vendor/diff-0.1.12
- vendor/difference
  vendor/digest-0.10.3
  vendor/directories
+ vendor/dissimilar-1.0.4
  vendor/dot
  vendor/dunce
  vendor/ecdsa
@@ -108,6 +111,7 @@ Files-Excluded:
  vendor/either-1.6.0
  vendor/either-1.6.1
  vendor/elliptic-curve
+ vendor/ena-0.14.0
  vendor/eyre
  vendor/ff
  vendor/fiat-crypto
@@ -141,7 +145,6 @@ Files-Excluded:
  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
@@ -151,14 +154,12 @@ Files-Excluded:
  vendor/js-sys
  vendor/kqueue
  vendor/kqueue-sys
- vendor/kstring
- vendor/libc-0.2.135
  vendor/libc-0.2.137
+ vendor/libc-0.2.138
  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
@@ -171,13 +172,15 @@ Files-Excluded:
  vendor/mach
  vendor/matches
  vendor/mimalloc
- vendor/miniz_oxide-0.5.3
  vendor/mio
  vendor/nix
+ vendor/nom8
  vendor/normalize-line-endings
  vendor/notify
+ vendor/num_cpus-1.13.1
+ vendor/object-0.30.1
  vendor/once_cell-1.12.0
- vendor/once_cell-1.15.0
+ vendor/once_cell-1.16.0
  vendor/oorandom
  vendor/openssl
  vendor/openssl-probe
@@ -188,22 +191,24 @@ Files-Excluded:
  vendor/os_info
  vendor/owo-colors
  vendor/p384
+ vendor/parking_lot_core-0.8.5
+ vendor/parking_lot_core-0.9.4
  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/quote-1.0.21
  vendor/rayon-1.5.3
+ vendor/rayon-1.6.0
  vendor/rayon-core-1.9.3
  vendor/redox_syscall-0.2.10
  vendor/redox_syscall-0.2.13
@@ -213,7 +218,6 @@ Files-Excluded:
  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
@@ -221,17 +225,19 @@ Files-Excluded:
  vendor/salsa-macros
  vendor/schannel
  vendor/scip
+ vendor/scoped-tls-1.0.0
  vendor/sec1
  vendor/security-framework
  vendor/security-framework-sys
  vendor/semver-1.0.12
  vendor/serde-1.0.137
- vendor/serde-1.0.145
+ vendor/serde-1.0.147
  vendor/serde_derive-1.0.137
- vendor/serde_derive-1.0.145
+ vendor/serde_derive-1.0.147
  vendor/serde_ignored
  vendor/serde_json-1.0.81
  vendor/serde_json-1.0.85
+ vendor/serde_spanned
  vendor/serde-value
  vendor/sha2-0.10.2
  vendor/sharded-slab-0.1.1
@@ -240,21 +246,21 @@ Files-Excluded:
  vendor/sized-chunks
  vendor/slice-group-by
  vendor/smallvec-1.8.1
- vendor/snap-1.0.1
  vendor/snapbox
  vendor/snapbox-macros
  vendor/socket2
  vendor/spki
  vendor/strip-ansi-escapes
  vendor/subtle
+ vendor/syn-1.0.102
  vendor/target-lexicon
- vendor/thiserror-1.0.37
- vendor/thiserror-impl-1.0.37
  vendor/threadpool
  vendor/tikv-jemallocator
  vendor/tikv-jemalloc-ctl
  vendor/tikv-jemalloc-sys
+ vendor/time-macros
  vendor/toml-0.5.7
+ vendor/toml
  vendor/toml_datetime
  vendor/toml_edit
  vendor/tracing-0.1.35
@@ -262,18 +268,20 @@ Files-Excluded:
  vendor/tracing-core-0.1.28
  vendor/tracing-error
  vendor/tracing-log-0.1.2
- vendor/tracing-subscriber
+ vendor/tracing-subscriber-0.3.3
  vendor/tracing-tree-0.2.0
  vendor/typed-arena
  vendor/typenum-1.15.0
  vendor/ui_test
  vendor/unicode-bidi-0.3.4
  vendor/unicode-ident-1.0.0
+ vendor/unicode-ident-1.0.5
  vendor/unicode-width-0.1.9
  vendor/url-2.2.2
  vendor/utf8parse
  vendor/vcpkg
  vendor/vte
+ vendor/vte_generate_state_changes
  vendor/wasm-bindgen-backend
  vendor/wasm-bindgen
  vendor/wasm-bindgen-macro
@@ -281,17 +289,11 @@ Files-Excluded:
  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
@@ -402,7 +404,6 @@ Comment:
 
 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
@@ -459,7 +460,7 @@ Files:
  vendor/rustc-demangle/*
  vendor/scoped-tls/*
  vendor/tar/*
- vendor/toml/*
+ vendor/toml-0*/*
  vendor/xz2/*
 Copyright: 2014-2020 Alex Crichton <alex@alexcrichton.com>
            2015-2017 The Rust Project Developers
@@ -482,6 +483,7 @@ Comment: see https://github.com/messense/rustc-test
 
 Files:
  vendor/addr2line/*
+ vendor/addr2line-*/*
 Copyright:
  2016-2021 Nick Fitzgerald <fitzgen@gmail.com>
  2016-2021 Philip Craig <philipjcraig@gmail.com>
@@ -512,14 +514,6 @@ Copyright: 2018-2020 Zibi Braniecki <gandalf@mozilla.com>
 License: Apache-2.0 or MIT
 Comment: see https://github.com/zbraniecki/annotate-snippets-rs
 
-Files: vendor/ansi_term/*
-Copyright:
- 2014-2020 ogham@bsago.me
- 2014-2020 Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
- 2014-2020 Josh Triplett <josh@joshtriplett.org>
-License: MIT
-Comment: see https://github.com/ogham/rust-ansi-term
-
 Files: vendor/aho-corasick/*
        vendor/memchr/*
 Copyright: 2015 Andrew Gallant <jamslam@gmail.com>
@@ -788,6 +782,11 @@ Copyright: 2017-2018 Matt Ickstadt <mattico8@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/mattico/elasticlunr-rs
 
+Files: vendor/elsa/*
+Copyright: 2018-2023 Manish Goregaokar <manishsmail@gmail.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/manishearth/elsa
+
 Files: vendor/ena/*
 Copyright: 2015-2020 Niko Matsakis <niko@alum.mit.edu>
 License: MIT or Apache-2.0
@@ -863,6 +862,7 @@ Comment: see https://github.com/fizyk20/generic-array.git
 
 Files:
  vendor/gimli/*
+ vendor/gimli-*/*
 Copyright:
  2016-2021 Nick Fitzgerald <fitzgen@gmail.com>
  2016-2021 Philip Craig <philipjcraig@gmail.com>
@@ -1050,6 +1050,7 @@ Comment:
 
 Files:
  vendor/miniz_oxide/*
+ vendor/miniz_oxide-0*/*
 Copyright: 2017-2020 Frommi <daniil.liferenko@gmail.com>
 License: MIT
 Comment: see https://github.com/Frommi/miniz_oxide
@@ -1072,6 +1073,14 @@ Copyright: 2018-2022 MSxDOS <melcodos@gmail.com>
 License: Apache-2.0 OR MIT
 Comment: see https://github.com/MSxDOS/ntapi
 
+Files: vendor/nu-ansi-term/*
+Copyright: 2014-2023 ogham@bsago.me
+           2014-2023 Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
+           2014-2023 Josh Triplett <josh@joshtriplett.org>
+           2014-2023 The Nushell Project Developers
+License: MIT
+Comment: see https://github.com/nushell/nu-ansi-term
+
 Files: vendor/num_cpus/*
 Copyright: 2015 Sean McArthur <sean.monstar@gmail.com>
 License: MIT
@@ -1111,6 +1120,11 @@ Copyright: 2019-2019 Phuntsok Drak-pa <phundrak@phundrak.fr>
 License: MIT
 Comment: see https://github.com/Phundrak/output-vt100-rs
 
+Files: vendor/overload/*
+Copyright: 2019-2022 Daniel Salvadori <danaugrs@gmail.com>
+License: MIT
+Comment: see https://github.com/danaugrs/overload
+
 Files:
  vendor/hashbrown/*
  vendor/hashbrown-0.*/*
@@ -1119,7 +1133,7 @@ Files:
  vendor/parking_lot/*
  vendor/parking_lot-0.11.2/*
  vendor/parking_lot_core/*
- vendor/parking_lot_core-0.8.5/*
+ vendor/parking_lot_core-0.*/*
 Copyright: 2016-2019 Amanieu d'Antras <amanieu@gmail.com>
 License: MIT or Apache-2.0
 Comment:
@@ -1271,13 +1285,6 @@ Copyright: 2017-2018 Aaronepower <theaaronepower@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/Aaronepower/remove_dir_all.git
 
-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: vendor/rowan/*
 Copyright: 2018-2022 Aleksey Kladov <aleksey.kladov@gmail.com>
 License: MIT OR Apache-2.0
@@ -1529,7 +1536,7 @@ Files:
  vendor/tracing-attributes/*
  vendor/tracing-core/*
  vendor/tracing-log/*
- vendor/tracing-subscriber-0.*/*
+ vendor/tracing-subscriber/*
 Copyright:
  2018-2020 Eliza Weisman <eliza@buoyant.io>
  2018-2020 Tokio Contributors <team@tokio.rs>
diff --git a/debian/libstd-rust-1.68.lintian-overrides b/debian/libstd-rust-1.68.lintian-overrides
deleted file mode 100644
index 2c675068f..000000000
--- a/debian/libstd-rust-1.68.lintian-overrides
+++ /dev/null
@@ -1,13 +0,0 @@
-# "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/libstd-rust-1.68.install b/debian/libstd-rust-1.69.install
index cd4545cca..cd4545cca 100644
--- a/debian/libstd-rust-1.68.install
+++ b/debian/libstd-rust-1.69.install
diff --git a/debian/libstd-rust-1.69.lintian-overrides b/debian/libstd-rust-1.69.lintian-overrides
new file mode 100644
index 000000000..f5bc02afc
--- /dev/null
+++ b/debian/libstd-rust-1.69.lintian-overrides
@@ -0,0 +1,13 @@
+# "libstd" just seemed too generic
+libstd-rust-1.69 binary: package-name-doesnt-match-sonames
+libstd-rust-1.69 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.69 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.69 binary: shlib-without-versioned-soname
+libstd-rust-1.69 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.69 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 6c3b0cfad..2f1c323c3 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -59,13 +59,13 @@ index 15cbb26..c012319 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 9cf43fc..39b985f 100644
+index 013d1ab..f6fd37b 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -770,10 +770,6 @@ class RustBuild(object):
+@@ -777,10 +777,6 @@ class RustBuild(object):
+         args = [self.cargo(), "build", "--manifest-path",
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
-         for _ in range(0, self.verbose):
-             args.append("--verbose")
+         args.extend("--verbose" for _ in range(verbose_count))
 -        if self.use_locked_deps:
 -            args.append("--locked")
 -        if self.use_vendored_sources:
@@ -74,7 +74,7 @@ index 9cf43fc..39b985f 100644
              args.append("--features")
              args.append("build-metrics")
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index b4fc1d4..2bb0659 100644
+index b33fc02..4492577 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
 @@ -629,8 +629,6 @@ impl<'a> Builder<'a> {
@@ -134,7 +134,7 @@ index b4fc1d4..2bb0659 100644
                  install::Rustfmt,
                  install::RustDemangler,
                  install::Clippy,
-@@ -1889,10 +1876,7 @@ impl<'a> Builder<'a> {
+@@ -1878,10 +1865,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -147,10 +147,10 @@ index b4fc1d4..2bb0659 100644
          }
  
 diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index 9bad904..d02edb0 100644
+index cc80763..19754a2 100644
 --- a/src/bootstrap/doc.rs
 +++ b/src/bootstrap/doc.rs
-@@ -75,7 +75,6 @@ macro_rules! book {
+@@ -76,7 +76,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!(
@@ -159,10 +159,10 @@ index 9bad904..d02edb0 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 6078e39..1a385f5 100644
+index b4f1506..27236f3 100644
 --- a/src/bootstrap/test.rs
 +++ b/src/bootstrap/test.rs
-@@ -2005,17 +2005,7 @@ impl Step for RustcGuide {
+@@ -2024,17 +2024,7 @@ impl Step for RustcGuide {
      }
  
      fn run(self, builder: &Builder<'_>) {
@@ -182,7 +182,7 @@ index 6078e39..1a385f5 100644
  }
  
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index f8cb4b7..3aa9ec6 100644
+index 70d1268..c7c6c3e 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
 @@ -36,11 +36,6 @@ walkdir = "2.3"
@@ -195,10 +195,10 @@ index f8cb4b7..3aa9ec6 100644
 -rustc-workspace-hack = "1.0"
 -
  # UI test dependencies
+ clap = { version = "4.1.4", features = ["derive"] }
  clippy_utils = { path = "clippy_utils" }
- derive-new = "0.5"
 diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
-index 286ef1e..3d68711 100644
+index 333f03c..2a0faa2 100644
 --- a/src/tools/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/Cargo.toml
 @@ -1,5 +1,14 @@
@@ -216,14 +216,14 @@ index 286ef1e..3d68711 100644
 +]
  exclude = ["crates/proc-macro-test/imp"]
  
- [profile.dev]
+ [workspace.package]
 diff --git a/src/tools/rustfmt/Cargo.toml b/src/tools/rustfmt/Cargo.toml
-index 7a4e02d..27b91f2 100644
+index 87ce59d..12ed654 100644
 --- a/src/tools/rustfmt/Cargo.toml
 +++ b/src/tools/rustfmt/Cargo.toml
 @@ -59,11 +59,6 @@ unicode_categories = "0.1"
  
- rustfmt-config_proc_macro = { version = "0.2", path = "config_proc_macro" }
+ rustfmt-config_proc_macro = { version = "0.3", path = "config_proc_macro" }
  
 -# A noop dependency that changes in the Rust repository, it's a bit of a hack.
 -# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
@@ -234,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 bc2edf6..142c2e9 100644
+index bddfdcf..9bac4b7 100644
 --- a/src/tools/tidy/src/deps.rs
 +++ b/src/tools/tidy/src/deps.rs
-@@ -332,7 +332,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
+@@ -333,7 +333,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.
@@ -246,7 +246,7 @@ index bc2edf6..142c2e9 100644
  ];
  
  /// Dependency checks.
-@@ -608,6 +608,8 @@ fn direct_deps_of<'a>(metadata: &'a Metadata, pkg_id: &'a PackageId) -> Vec<&'a
+@@ -609,6 +609,8 @@ fn direct_deps_of<'a>(metadata: &'a Metadata, pkg_id: &'a PackageId) -> Vec<&'a
  }
  
  fn check_rustfix(metadata: &Metadata, bad: &mut bool) {
diff --git a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
index d17b24beb..703df2a78 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 486d67e..723b2e9 100644
+index 1ebd2cc..0d6ebc8 100644
 --- a/vendor/cc/src/lib.rs
 +++ b/vendor/cc/src/lib.rs
-@@ -2369,7 +2369,7 @@ impl Build {
+@@ -2389,7 +2389,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 086ece034..23667ffde 100644
--- a/debian/patches/d-0004-clippy-feature-sync.patch
+++ b/debian/patches/d-0004-clippy-feature-sync.patch
@@ -6,14 +6,14 @@ enable features needed by rustfmt to make build system happy and speedup build.
 this is what rustc_workspace_hack does in the upstream build.
 ---
  src/tools/clippy/Cargo.toml  | 2 +-
- src/tools/rustfmt/Cargo.toml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/tools/rustfmt/Cargo.toml | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index 3aa9ec6..0bb813d 100644
+index c7c6c3e..7e453c7 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
-@@ -43,7 +43,7 @@ if_chain = "1.0"
+@@ -44,7 +44,7 @@ if_chain = "1.0"
  itertools = "0.10.1"
  quote = "1.0"
  serde = { version = "1.0.125", features = ["derive"] }
@@ -23,10 +23,15 @@ index 3aa9ec6..0bb813d 100644
  parking_lot = "0.12"
  tokio = { version = "1", features = ["io-util"] }
 diff --git a/src/tools/rustfmt/Cargo.toml b/src/tools/rustfmt/Cargo.toml
-index 27b91f2..12d1567 100644
+index 12ed654..f85b738 100644
 --- a/src/tools/rustfmt/Cargo.toml
 +++ b/src/tools/rustfmt/Cargo.toml
-@@ -49,7 +49,7 @@ lazy_static = "1.4"
+@@ -46,10 +46,12 @@ getopts = "0.2"
+ ignore = "0.4"
+ itertools = "0.10"
+ lazy_static = "1.4"
++# added for sync with clippy
++libc = { version = "0.2", features = ["extra_traits"] }
  log = "0.4"
  regex = "1.5"
  serde = { version = "1.0", features = ["derive"] }
diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index ac23de8bb..17254fb53 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -8,10 +8,10 @@ Subject: d-0005-no-jemalloc
  2 files changed, 8 deletions(-)
 
 diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
-index 27ee3dd..87fb29f 100644
+index 41003ad..0578f7b 100644
 --- a/compiler/rustc/Cargo.toml
 +++ b/compiler/rustc/Cargo.toml
-@@ -13,13 +13,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
+@@ -14,13 +14,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
  # crate is intended to be used by stable MIR consumers, which are not in-tree
  rustc_smir = { path = "../rustc_smir" }
  
@@ -22,14 +22,14 @@ index 27ee3dd..87fb29f 100644
 -
  [features]
 -jemalloc = ['jemalloc-sys']
- llvm = ['rustc_driver/llvm']
- max_level_info = ['rustc_driver/max_level_info']
- rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler']
+ llvm = ['rustc_driver_impl/llvm']
+ max_level_info = ['rustc_driver_impl/max_level_info']
+ rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler']
 diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
-index 01d1735..bf0ba06 100644
+index 6273ea5..642fb05 100644
 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
-@@ -15,7 +15,6 @@ cfg-if = "1.0.0"
+@@ -17,7 +17,6 @@ cfg-if = "1.0.0"
  libc = "0.2.135"
  la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
  countme = { version = "3.0.1", features = ["enable"] }
@@ -37,7 +37,7 @@ index 01d1735..bf0ba06 100644
  
  [target.'cfg(target_os = "linux")'.dependencies]
  perf-event = "0.4.7"
-@@ -25,7 +24,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
+@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
  
  [features]
  cpu_profiler = []
diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch
index baba25534..8b6b5a82a 100644
--- a/debian/patches/d-bootstrap-cargo-doc-paths.patch
+++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch
@@ -93,15 +93,15 @@ diff --git a/src/doc/index.md b/src/doc/index.md
 index 2c92d5e..9be58d5 100644
 --- a/src/doc/index.md
 +++ b/src/doc/index.md
-@@ -87,7 +87,7 @@ accomplishing various tasks.
+@@ -130,7 +130,7 @@
  
- ## The Cargo Book
+ ### The Cargo Book
  
--[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager.
-+[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and dependency manager.
- 
- ## The Rustdoc Book
+-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and
++[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and
+ dependency manager.
  
+ ### The Rustdoc Book
 diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md
 index 6966cec..0ca3589 100644
 --- a/src/doc/reference/src/conditional-compilation.md
@@ -353,9 +353,9 @@ Index: rust/src/doc/rustc/src/linker-plugin-lto.md
  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
+--- a/src/doc/rustc/src/platform-support/fuchsia.md
++++ b/src/doc/rustc/src/platform-support/fuchsia.md
+@@ -932,7 +932,7 @@
  [Fuchsia]: https://fuchsia.dev/
  [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
  [rustup]: https://rustup.rs/
diff --git a/debian/patches/u-fix-sysroot-detection-logic.patch b/debian/patches/u-fix-sysroot-detection-logic.patch
index 3bb0797ba..64cc291f7 100644
--- a/debian/patches/u-fix-sysroot-detection-logic.patch
+++ b/debian/patches/u-fix-sysroot-detection-logic.patch
@@ -6,7 +6,7 @@ Description: Fix sysroot detection which would result in /usr/lib/lib/rustlib
 Bug: https://github.com/rust-lang/rust/issues/109994
 --- a/compiler/rustc_session/src/filesearch.rs
 +++ b/compiler/rustc_session/src/filesearch.rs
-@@ -180,18 +180,29 @@
+@@ -179,7 +179,7 @@
          ))?;
  
          // if `dir` points target's dir, move up to the sysroot
@@ -14,15 +14,17 @@ Bug: https://github.com/rust-lang/rust/issues/109994
 +        let mut sysroot_dir = if dir.ends_with(crate::config::host_triple()) {
              dir.parent() // chop off `$target`
                  .and_then(|p| p.parent()) // chop off `rustlib`
-                 .and_then(|p| p.parent()) // chop off `lib`
+                 .and_then(|p| {
+@@ -194,13 +194,25 @@
+                     }
+                 })
                  .map(|s| s.to_owned())
 -                .ok_or(format!(
--                    "Could not move 3 levels upper using `parent()` on {}",
--                    dir.display()
++                .ok_or_else(|| format!(
+                     "Could not move 3 levels upper using `parent()` on {}",
+                     dir.display()
 -                ))
-+                .ok_or_else(|| {
-+                    format!("Could not move 3 levels upper using `parent()` on {}", dir.display())
-+                })?
++                ))?
          } else {
 -            Ok(dir.to_owned())
 +            dir.to_owned()
diff --git a/debian/patches/u-reproducible-dl-stage0.patch b/debian/patches/u-reproducible-dl-stage0.patch
index b6ba259ec..0ac05cb8b 100644
--- a/debian/patches/u-reproducible-dl-stage0.patch
+++ b/debian/patches/u-reproducible-dl-stage0.patch
@@ -11,12 +11,12 @@ diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
 index ab4338e..0227735 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -92,7 +92,7 @@ def _download(path, url, probably_big, v
-              "-L", # Follow redirect.
-              "-y", "30", "-Y", "10",    # timeout if speed is < 10 bytes/sec for > 30 seconds
-              "--connect-timeout", "30",  # timeout if cannot connect within 30 seconds
--             "--retry", "3", "-Sf", "-o", path, url],
-+             "--retry", "3", "-Sf", "-o", path, "-R", url],
-             verbose=verbose,
-             exception=True, # Will raise RuntimeError on failure
-         )
+@@ -92,7 +92,7 @@
+                 "-L", # Follow redirect.
+                 "-y", "30", "-Y", "10",    # timeout if speed is < 10 bytes/sec for > 30 seconds
+                 "--connect-timeout", "30",  # timeout if cannot connect within 30 seconds
+-                "--retry", "3", "-Sf", url],
++                "--retry", "3", "-Sf", "-R", url],
+                 stdout=outfile,    #Implements cli redirect operator '>'
+                 verbose=verbose,
+                 exception=True, # Will raise RuntimeError on failure
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 883fb4fae..c64e38e30 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,7 +2,6 @@
 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 [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]
diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt
index 4cc8b41d0..4a769ceee 100644
--- a/debian/upstream-tarball-unsuspicious.txt
+++ b/debian/upstream-tarball-unsuspicious.txt
@@ -10,6 +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
+src/tools/clippy/book/src/lint_configuration.md
 vendor/chalk-solve-0.87.0/src/infer/test.rs
 vendor/itertools*/examples/iris.data
 vendor/minifier/src/js/tools.rs
@@ -23,7 +24,7 @@ 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
+compiler/rustc_codegen_ssa/locales/en-US.ftl
 library/core/src/ffi/c_*.md
 library/portable-simd/*.md
 library/stdarch/CONTRIBUTING.md
@@ -67,6 +68,7 @@ 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
+tests/ui/parser/raw/too-many-hash.stderr
 vendor/ahash-0.7.6/FAQ.md
 vendor/ahash/FAQ.md
 vendor/ammonia/src/lib.rs
@@ -86,7 +88,7 @@ vendor/*/LICENSE
 vendor/*/LICENSE-MIT
 vendor/maplit/README.rst
 vendor/mdbook/CONTRIBUTING.md
-vendor/miniz_oxide/Readme.md
+vendor/miniz_oxide*/Readme.md
 vendor/pulldown-cmark/tests/suite/footnotes.rs
 vendor/*/README.md
 vendor/rustc-demangle/src/legacy.rs
@@ -98,7 +100,7 @@ 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/tracing-subscriber/src/fmt/format/json.rs
 vendor/unicase/src/lib.rs
 vendor/unicode-normalization/src/stream_safe.rs
 vendor/winapi/src/lib.rs
@@ -145,6 +147,7 @@ vendor/stacker/src/arch/windows.c
 
 # False-positive, misc
 src/doc/rustc-dev-guide/src/queries/example-0.counts.txt
+src/etc/vscode_settings.json
 src/stage0.json
 src/tools/clippy/.remarkrc
 vendor/elasticlunr-rs/src/lang/*.rs
@@ -173,6 +176,7 @@ 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
+vendor/overload/logo.png
 vendor/pretty_assertions/examples/*.png
 
 # Example code
@@ -237,7 +241,7 @@ vendor/elasticlunr-rs/tests/searchindex_fixture_*.json
 vendor/flate2/tests/corrupt-gz-file.bin
 vendor/flate2/tests/*.gz
 vendor/fluent-syntax/benches/parser.rs
-vendor/gimli/fixtures/self/*
+vendor/gimli*/fixtures/self/*
 vendor/gsgdt/tests/*.json
 vendor/handlebars/tests/helper_with_space.rs
 vendor/html5ever/data/bench/*.html
@@ -342,18 +346,18 @@ vendor/flate2/src/mem.rs
 vendor/flate2/src/zio.rs
 vendor/futures-macro/src/lib.rs
 vendor/futures-macro/src/select.rs
-vendor/gimli/src/read/aranges.rs
-vendor/gimli/src/read/line.rs
-vendor/gimli/src/read/loclists.rs
-vendor/gimli/src/read/lookup.rs
-vendor/gimli/src/read/rnglists.rs
-vendor/gimli/src/read/unit.rs
+vendor/gimli*/src/read/aranges.rs
+vendor/gimli*/src/read/line.rs
+vendor/gimli*/src/read/loclists.rs
+vendor/gimli*/src/read/lookup.rs
+vendor/gimli*/src/read/rnglists.rs
+vendor/gimli*/src/read/unit.rs
 vendor/icu_locid/tests/langid.rs
 vendor/icu_locid/tests/locale.rs
 vendor/indoc/src/lib.rs
 vendor/libm/src/math/atan.rs
-vendor/miniz_oxide/src/deflate/mod.rs
-vendor/miniz_oxide/src/inflate/mod.rs
+vendor/miniz_oxide*/src/deflate/mod.rs
+vendor/miniz_oxide*/src/inflate/mod.rs
 vendor/nom/src/bits/complete.rs
 vendor/nom/src/bits/mod.rs
 vendor/nom/src/bits/streaming.rs