Merging debian version 1.70.0+dfsg1-7.

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

1 files changed, 144 insertions, 28 deletions

diff --git a/debian/copyright b/debian/copyright
index dab084da3..edf1cc050 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,7 @@ Files-Excluded:
 # check that certain popular crates continue to compile. It is not the same as
 # cargo's own test suite (in its own package) also called cargotest.
 # NB: don't exclude rust-installer, it's needed for "install" functionality
+ .gitmodules
  src/tools/cargo
  src/tools/rls
  src/tools/remote-test-client
@@ -38,11 +39,10 @@ Files-Excluded:
  vendor/mdbook/src/theme/playground_editor
  vendor/psm/src/arch/wasm32.o
  vendor/rustix/src/backend/linux_raw/arch/outline/*/*.a
+ vendor/rustix-0.*/src/backend/linux_raw/arch/outline/*/*.a
  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
@@ -51,6 +51,7 @@ Files-Excluded:
  vendor/anyhow-1.0.66
  vendor/anymap
  vendor/arbitrary
+ vendor/arc-swap
  vendor/arrayvec-0.5.2
  vendor/arrayvec-0.7.0
  vendor/backtrace-0.3.66
@@ -59,6 +60,7 @@ Files-Excluded:
  vendor/base64ct
  vendor/bitmaps
  vendor/bstr
+ vendor/btoi
  vendor/bumpalo
  vendor/bytesize
  vendor/camino-1.0.9
@@ -69,13 +71,12 @@ Files-Excluded:
  vendor/chalk-ir
  vendor/chalk-recursive
  vendor/chalk-solve
+ vendor/clru
  vendor/color-eyre
  vendor/color-spantrace
  vendor/command-group
- vendor/commoncrypto
- vendor/commoncrypto-sys
  vendor/concolor
- vendor/concolor-query
+ vendor/concolor-query-0.1.0
  vendor/const-oid
  vendor/content_inspector
  vendor/core-foundation
@@ -93,7 +94,6 @@ Files-Excluded:
  vendor/cranelift-object
  vendor/crypto-bigint
  vendor/crypto-common-0.1.3
- vendor/crypto-hash
  vendor/ct-codecs
  vendor/ctor-0.1.22
  vendor/curl
@@ -115,14 +115,13 @@ Files-Excluded:
  vendor/eyre
  vendor/ff
  vendor/fiat-crypto
- vendor/filetime-0.2.14
  vendor/filetime-0.2.16
+ vendor/filetime-0.2.19
  vendor/flate2-1.0.23
  vendor/foreign-types
  vendor/foreign-types-shared
  vendor/form_urlencoded-1.0.1
  vendor/fsevent-sys
- vendor/fs_extra-1.1.0
  vendor/fs_extra
  vendor/fst
  vendor/fwdansi
@@ -130,11 +129,48 @@ Files-Excluded:
  vendor/generic-array-0.14.4
  vendor/git2
  vendor/git2-curl
+ vendor/gix-actor
+ vendor/gix-attributes
+ vendor/gix-bitmap
+ vendor/gix
+ vendor/gix-chunk
+ vendor/gix-command
+ vendor/gix-config
+ vendor/gix-config-value
+ vendor/gix-credentials
+ vendor/gix-date
+ vendor/gix-diff
+ vendor/gix-discover
+ vendor/gix-features
+ vendor/gix-glob
+ vendor/gix-hash
+ vendor/gix-hashtable
+ vendor/gix-index
+ vendor/gix-lock
+ vendor/gix-mailmap
+ vendor/gix-object
+ vendor/gix-odb
+ vendor/gix-pack
+ vendor/gix-packetline
+ vendor/gix-path
+ vendor/gix-prompt
+ vendor/gix-protocol
+ vendor/gix-quote
+ vendor/gix-ref
+ vendor/gix-refspec
+ vendor/gix-revision
+ vendor/gix-sec
+ vendor/gix-tempfile
+ vendor/gix-transport
+ vendor/gix-traverse
+ vendor/gix-url
+ vendor/gix-validate
+ vendor/gix-worktree
  vendor/globset-0.4.8
  vendor/group
  vendor/handlebars-3.5.5
  vendor/heck-0.3.3
- vendor/hex-0.3.2
+ vendor/hermit-abi-0.3.0
  vendor/hex-0.4.2
  vendor/hkalbasi-rustc-ap-rustc_abi
  vendor/hkalbasi-rustc-ap-rustc_index
@@ -143,19 +179,24 @@ Files-Excluded:
  vendor/home-0.5.3
  vendor/http-auth
  vendor/idna-0.2.0
+ vendor/imara-diff
  vendor/im-rc
  vendor/indenter
+ vendor/indexmap-1.9.2
  vendor/inotify
  vendor/inotify-sys
- vendor/io-lifetimes-1.0.1
+ vendor/io-close
+ vendor/io-lifetimes-1.0.3
+ vendor/is-terminal-0.4.4
  vendor/itoa-1.0.2
+ vendor/itoa-1.0.5
  vendor/jemalloc-sys
  vendor/jod-thread
  vendor/js-sys
  vendor/kqueue
  vendor/kqueue-sys
- vendor/libc-0.2.137
  vendor/libc-0.2.138
+ vendor/libc-0.2.139
  vendor/libffi
  vendor/libffi-sys
  vendor/libgit2-sys
@@ -165,12 +206,13 @@ Files-Excluded:
  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
  vendor/mach
  vendor/matches
+ vendor/maybe-async
+ vendor/memmap2-0.5.8
  vendor/mimalloc
  vendor/mio
  vendor/nix
@@ -178,11 +220,14 @@ Files-Excluded:
  vendor/normalize-line-endings
  vendor/notify
  vendor/num_cpus-1.13.1
+ vendor/num_threads
  vendor/object-0.30.1
  vendor/once_cell-1.12.0
  vendor/once_cell-1.16.0
+ vendor/once_cell-1.17.0
  vendor/oorandom
  vendor/openssl
+ vendor/openssl-macros
  vendor/openssl-probe
  vendor/openssl-src
  vendor/openssl-sys
@@ -201,12 +246,14 @@ Files-Excluded:
  vendor/pkcs8
  vendor/pretty_env_logger
  vendor/proc-macro2-1.0.46
+ vendor/proc-macro2-1.0.50
+ vendor/prodash
  vendor/protobuf
  vendor/protobuf-support
  vendor/pulldown-cmark-to-cmark
  vendor/quick-error
  vendor/quote-1.0.18
- vendor/quote-1.0.21
+ vendor/quote-1.0.23
  vendor/rayon-1.5.3
  vendor/rayon-1.6.0
  vendor/rayon-core-1.9.3
@@ -218,7 +265,6 @@ Files-Excluded:
  vendor/region
  vendor/rfc6979
  vendor/rustc-build-sysroot
- vendor/rustix-0.36.3
  vendor/ryu-1.0.10
  vendor/ryu-1.0.5
  vendor/salsa
@@ -231,21 +277,23 @@ Files-Excluded:
  vendor/security-framework-sys
  vendor/semver-1.0.12
  vendor/serde-1.0.137
- vendor/serde-1.0.147
+ vendor/serde-1.0.152
  vendor/serde_derive-1.0.137
- vendor/serde_derive-1.0.147
+ vendor/serde_derive-1.0.152
  vendor/serde_ignored
  vendor/serde_json-1.0.81
  vendor/serde_json-1.0.85
  vendor/serde_spanned
  vendor/serde-value
+ vendor/sha1_smol
  vendor/sha2-0.10.2
  vendor/sharded-slab-0.1.1
+ vendor/signal-hook
+ vendor/signal-hook-registry
  vendor/signature
  vendor/similar
  vendor/sized-chunks
  vendor/slice-group-by
- vendor/smallvec-1.8.1
  vendor/snapbox
  vendor/snapbox-macros
  vendor/socket2
@@ -254,7 +302,7 @@ Files-Excluded:
  vendor/subtle
  vendor/syn-1.0.102
  vendor/target-lexicon
- vendor/threadpool
+ vendor/termcolor-1.1.3
  vendor/tikv-jemallocator
  vendor/tikv-jemalloc-ctl
  vendor/tikv-jemalloc-sys
@@ -274,11 +322,11 @@ Files-Excluded:
  vendor/typenum-1.15.0
  vendor/ui_test
  vendor/unicode-bidi-0.3.4
+ vendor/unicode-bom
  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
@@ -288,13 +336,21 @@ Files-Excluded:
  vendor/wasm-bindgen-macro-support
  vendor/wasm-bindgen-shared
  vendor/wasmtime-jit-icache-coherence
+ vendor/windows-0.43.0
  vendor/windows_aarch64_gnullvm-0.42.0
+ vendor/windows_aarch64_gnullvm-0.42.1
  vendor/windows_aarch64_msvc-0.42.0
+ vendor/windows_aarch64_msvc-0.42.1
  vendor/windows_i686_gnu-0.42.0
+ vendor/windows_i686_gnu-0.42.1
  vendor/windows_i686_msvc-0.42.0
+ vendor/windows_i686_msvc-0.42.1
  vendor/windows_x86_64_gnu-0.42.0
+ vendor/windows_x86_64_gnu-0.42.1
  vendor/windows_x86_64_gnullvm-0.42.0
+ vendor/windows_x86_64_gnullvm-0.42.1
  vendor/windows_x86_64_msvc-0.42.0
+ vendor/windows_x86_64_msvc-0.42.1
  vendor/xattr-0.2.2
  vendor/yaml-merge-keys
  vendor/yaml-rust
@@ -309,7 +365,7 @@ Files: C*.md
        LICENSE*
        compiler/*
        configure
-       config.toml.example
+       config.example.toml
        git-commit-hash
        git-commit-info
        library/*
@@ -322,8 +378,8 @@ Files: C*.md
        src/rust*
        src/stage0.json
        src/tools/*
-       tests/*
        src/version
+       tests/*
        version
        x.py
        .cargo/config.toml
@@ -367,6 +423,14 @@ Copyright: 2019-2022 Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/tkaitchuck/ahash
 
+Files:
+ vendor/anstream/*
+ vendor/anstyle/*
+ vendor/anstyle-parse/*
+ vendor/anstyle-wincon/*
+Copyright: 2023 Ed Page <eopage@gmail.com>
+License: MIT or Apache-2.0
+
 Files: vendor/ar_archive_writer/*
 Copyright: 2003-2017 University of Illinois at Urbana-Champaign.
 License: Apache-2.0 with LLVM exception
@@ -542,6 +606,12 @@ Copyright: 2015-2022 The Rust Project Developers
 License: MIT or Apache-2.0
 Comment: see https://github.com/rust-lang/backtrace-rs
 
+Files: vendor/basic-toml/*
+Copyright: 2014-2023 Alex Crichton <alex@alexcrichton.com>
+           2014-2023 David Tolnay <dtolnay@gmail.com>
+License: MIT OR Apache-2.0
+Comment: see https://github.com/dtolnay/basic-toml
+
 Files:
  vendor/block-buffer/*
  vendor/digest/*
@@ -633,6 +703,7 @@ Comment: see https://github.com/chronotope/chrono
 Files: 
  vendor/clap/*
  vendor/clap-3.*/*
+ vendor/clap_builder/*
  vendor/clap_complete/*
  vendor/clap_derive/*
  vendor/clap_derive-3.*/*
@@ -647,6 +718,13 @@ Copyright: 2016-2020 Thomas Wickham <mackwic@gmail.com>
 License: MPL-2.0
 Comment: see https://github.com/mackwic/colored
 
+Files:
+ vendor/concolor-override/*
+ vendor/concolor-query/*
+Copyright: 2021-2022 Ed Page <eopage@gmail.com>
+License: MIT OR Apache-2.0
+Comment: see https://github.com/rust-cli/concolor
+
 Files: vendor/convert_case/*
 Copyright: 2020-2022 David Purdum <purdum41@gmail.com>
 License: MIT
@@ -722,6 +800,7 @@ Files:
  vendor/itoa/*
  vendor/quote/*
  vendor/syn/*
+ vendor/syn-1.*/*
  vendor/unicode-ident/*
 Copyright: 2016-2022 David Tolnay <dtolnay@gmail.com>
 License: MIT or Apache-2.0
@@ -792,7 +871,9 @@ Copyright: 2015-2020 Niko Matsakis <niko@alum.mit.edu>
 License: MIT or Apache-2.0
 Comment: see https://github.com/nikomatsakis/ena
 
-Files: vendor/errno/*
+Files:
+ vendor/errno/*
+ vendor/errno-*/*
 Copyright: 2015-2022 Chris Wong <lambda.fairy@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/lambda-fairy/rust-errno
@@ -971,6 +1052,11 @@ Copyright: 2018-2021 Changseok Han <freestrings@gmail.com>
 License: MIT
 Comment: see https://github.com/freestrings/jsonpath
 
+Files: vendor/junction/*
+Copyright: 2019-2023 Lzu Tao <taolzu@gmail.com>
+License: MIT
+Comment: see https://github.com/lzutao/junction
+
 Files: vendor/lazycell/*
 Copyright: 2016-2020 Alex Crichton <alex@alexcrichton.com>
            2016-2020 Nikita Pekin <contact@nikitapek.in>
@@ -994,7 +1080,9 @@ Copyright: 2018-2021 Jorge Aparicio <jorge@japaric.io>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/rust-lang-nursery/libm
 
-Files: vendor/linux-raw-sys/*
+Files:
+ vendor/linux-raw-sys/*
+ vendor/linux-raw-sys-0.*/*
 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/linux-raw-sys
@@ -1042,6 +1130,16 @@ Copyright: 2017-2019 Gilad Naaman <gilad.naaman@gmail.com>
 License: MIT
 Comment: see https://github.com/Gilnaa/memoffset
 
+Files: vendor/mime/*
+Copyright: 2014-2019 Sean McArthur <sean@seanmonstar.com>
+License: MIT or Apache-2.0
+Comment: see https://github.com/hyperium/mime
+
+Files: vendor/mime_guess/*
+Copyright: 2015-2023 Austin Bonander <austin.bonander@gmail.com>
+License: MIT
+Comment: see https://github.com/abonander/mime_guess
+
 Files: vendor/minifier/*
 Copyright: 2017-2018 Guillaume Gomez <guillaume1.gomez@gmail.com>
 License: MIT
@@ -1318,9 +1416,11 @@ Copyright:
 License: Apache-2.0 or MIT
 Comment: see https://github.com/killercup/rustfix
 
-Files: vendor/rustix/*
-Copyright: 2020-2022 Dan Gohman <dev@sunfishcode.online>
-           2020-2022 Jakub Konka <kubkon@jakubkonka.com>
+Files:
+ vendor/rustix/*
+ vendor/rustix-0.*/*
+Copyright: 2020-2023 Dan Gohman <dev@sunfishcode.online>
+           2020-2023 Jakub Konka <kubkon@jakubkonka.com>
 License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT
 Comment: see https://github.com/bytecodealliance/rustix
 
@@ -1439,9 +1539,11 @@ Copyright: 2017-2023 Peter Glotfelty <peter.glotfelty@microsoft.com>
 License: MIT
 Comment: see https://github.com/Peternator7/strum
 
-Files: vendor/synstructure/*
+Files:
+ vendor/synstructure/*
+ vendor/synstructure-0.*/*
 Copyright:
- 2016-2019 Nika Layzell <nika@thelayzells.com>
+ 2016-2023 Nika Layzell <nika@thelayzells.com>
 License: MIT
 Comment: see https://github.com/mystor/synstructure
 
@@ -1510,6 +1612,13 @@ Copyright: 2021-2022 David Wood <david.wood@huawei.com>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/davidtwco/thorin
 
+Files: vendor/threadpool/*
+Copyright: 2015-2021 The Rust Project Developers
+           2015-2021 Corey Farwell <coreyf@rwell.org>
+           2015-2021 Stefan Schindler <dns2utf8@estada.ch>
+License: MIT or Apache-2.0
+Comment: see https://github.com/rust-threadpool/rust-threadpool
+
 Files: vendor/tinystr/*
 Copyright: 2019-2022 Raph Levien <raph.levien@gmail.com>
            2019-2022 Zibi Braniecki <zibi@braniecki.net>
@@ -1639,6 +1748,12 @@ Copyright: 2015-2018 Simon Sapin <simon.sapin@exyr.org>
 License: MIT OR Apache-2.0
 Comment: see https://github.com/SimonSapin/rust-utf8
 
+Files: vendor/utf8parse/*
+Copyright: 2016-2023 Joe Wilm <joe@jwilm.com>
+           2016-2023 Christian Duerr <contact@christianduerr.com>
+License: Apache-2.0 OR MIT
+Comment: see https://github.com/alacritty/vte
+
 Files: vendor/uuid/*
 Copyright: 2014-2023 Ashley Mannix<ashleymannix@live.com.au>
            2014-2023 Christopher Armstrong
@@ -1749,6 +1864,7 @@ License: MIT
 Comment: see https://github.com/tokio-rs/valuable
 
 Files:
+ vendor/windows/*
  vendor/windows-sys/*
  vendor/windows-sys-0.*/*
  vendor/windows-targets/*