diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:47 +0000 |
| commit | 9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1 (patch) | |
| tree | 3f4102a262698a69127c4c527a3efe30a13ac7df | |
| parent | Merging upstream version 1.71.1+dfsg1. (diff) | |
| download | rustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.tar.xz rustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.zip | |
Adding debian version 1.71.1+dfsg1-1.debian/1.71.1+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
45 files changed, 1681 insertions, 1186 deletions
diff --git a/debian/changelog b/debian/changelog index 341a21a78..f72aae990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +rustc (1.71.1+dfsg1-1) unstable; urgency=medium + + * upload to unstable + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Thu, 16 May 2024 21:46:58 +0200 + +rustc (1.71.1+dfsg1-1~exp2) experimental; urgency=medium + + * d/control: properly B+R old rustc packages (Closes: #1071005) + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Wed, 15 May 2024 07:21:42 +0200 + +rustc (1.71.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release (Closes: #1069019) + * d/control: tighten cargo versions (Closes: #1029007) + * d/control: remove B-D on cmake-3 (Closes: #1067109) + * d/control: re-enable git-using tests + * rust-doc: fix references to cargo-doc (Closes: #969210, #1063390) + * rust-src: ship Cargo.lock (Closes: #1057736) + * d/control: add libssl and prefer curl with openssl (Closes: #962508) + * d/control: move LLVM symlinks to own package (Closes: #1021868) + + [ Rob Shearman ] + * Support finding llvm-profdata & llvm-cov with cargo-binutils + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Wed, 08 May 2024 18:48:48 +0200 + rustc (1.70.0+dfsg2-1) unstable; urgency=medium * upload to unstable diff --git a/debian/config.toml.in b/debian/config.toml.in index b4e7c8d7d..d68eb0451 100644 --- a/debian/config.toml.in +++ b/debian/config.toml.in @@ -66,6 +66,7 @@ rpath = false # see also d-custom-debuginfo-path.patch remap-debuginfo = true +omit-git-hash = true verbose-tests = true backtrace-on-ice = true diff --git a/debian/control b/debian/control index a655ffdd2..b4956fd54 100644 --- a/debian/control +++ b/debian/control @@ -13,16 +13,16 @@ Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.17.14), python3:native, - cargo:native (>= 0.69.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (>= 1.69.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (<= 1.70.0++) <!pkg.rustc.dlstage0>, + cargo:native (>= 1.70.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (>= 1.70.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (<= 1.71.1++) <!pkg.rustc.dlstage0>, llvm-16-dev:native, llvm-16-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>, gcc-mingw-w64-i686-posix:native [i386] <!nowindows>, libllvm16t64 (>= 1:16.0.0), libclang-rt-16-dev:native, - cmake (>= 3.0) | cmake3, + cmake (>= 3.0), # needed by some vendor crates pkgconf, # this is sometimes needed by rustc_llvm @@ -32,15 +32,16 @@ Build-Depends: liblzma-dev:native, # used by cargo bash-completion, - libcurl4-gnutls-dev | libcurl4-openssl-dev, + libcurl4-openssl-dev | libcurl4-gnutls-dev, libssh2-1-dev, + libssl-dev, libgit2-dev (>= 1.7.1), libgit2-dev (<< 1.8~~), libhttp-parser-dev, # test dependencies: binutils (>= 2.26) <!nocheck> | binutils-2.26 <!nocheck>, # temporarily disabled cause of #1066794 / t64 transition -# git <!nocheck>, + git <!nocheck>, procps <!nocheck>, # below are optional tools even for 'make check' gdb (>= 7.12) <!nocheck>, @@ -65,12 +66,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}), gcc, libc-dev, binutils (>= 2.26) Recommends: - cargo (>= 0.71.0~~), cargo (<< 0.72.0~~), + cargo (= ${binary:Version}), # llvm is needed for llvm-dwp for -C split-debuginfo=packed - llvm-16, -Suggests: -# lld and clang are needed for wasm compilation - lld-16, clang-16, + rust-llvm, Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~) Description: Rust systems programming language @@ -86,7 +84,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.70 +Package: libstd-rust-1.71 Section: libs Architecture: any Multi-Arch: same @@ -113,7 +111,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libstd-rust-1.70 (= ${binary:Version}), + libstd-rust-1.71 (= ${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 @@ -229,6 +227,38 @@ Description: Rust debugger (lldb) This package contains pretty printers and a wrapper script for invoking lldb on rust binaries. +Package: rust-llvm +Architecture: all +Breaks: + rustc (<< 1.71.1+dfsg1-1~exp1), + rust-web (<< 1.71.1+dfsg1-1~exp1), + rust-mozilla (<< 1.71.1+dfsg1-1~exp1), +Replaces: + rustc (<< 1.71.1+dfsg1-1~exp1), + rust-web (<< 1.71.1+dfsg1-1~exp1), + rust-mozilla (<< 1.71.1+dfsg1-1~exp1), +Depends: + ${misc:Depends}, +# lld and clang are needed for wasm compilation + lld-16, clang-16, +# llvm is needed for llvm-dwp for split-debuginfo=packed + llvm-16 +Description: Rust LLVM integration + Rust is a curly-brace, block-structured expression language. It + visually resembles the C language family, but differs significantly + in syntactic and semantic details. Its design is oriented toward + concerns of "programming in the large", that is, of creating and + maintaining boundaries - both abstract and operational - that + preserve large-system integrity, availability and concurrency. + . + It supports a mixture of imperative procedural, concurrent actor, + object-oriented and pure functional styles. Rust also supports + generic programming and meta-programming, in both static and dynamic + styles. + . + This package contains symlinks for integration with LLVM tools such as lld and + grcov. + Package: rust-doc Section: doc Architecture: all @@ -276,7 +306,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.70 (= ${binary:Version}) + libstd-rust-1.71 (= ${binary:Version}) Recommends: cargo Description: Rust linter Rust is a curly-brace, block-structured expression language. It diff --git a/debian/copyright b/debian/copyright index bb2fd504c..0cf15d2dc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: rust Source: https://www.rust-lang.org Files-Excluded: + .gitmodules *.min.js src/llvm-project # Pre-generated docs @@ -42,39 +43,49 @@ 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.36.5/src/backend/linux_raw/arch/outline/*/*.a - vendor/winapi-*/*/*.a # Embedded submodule used for CI library/stdarch/crates/intrinsic-test/acle # Misc vendor/*/icon_CLion.svg vendor/wasm-bindgen/guide - vendor/nix/test/test_kmod/hello_mod/hello.c vendor/wasm-bindgen/examples/import_js/index.js vendor/wasm-bindgen/examples/import_js/webpack.config.js # unused dependencies, generated by debian/prune-unused-deps # DO NOT EDIT below, AUTOGENERATED - vendor/ahash-0.7.4 + vendor/ahash-0.8.2 + vendor/aho-corasick-0.7.18 vendor/ansi_term vendor/anstyle-wincon vendor/anyhow-1.0.65 vendor/anyhow-1.0.66 + vendor/anyhow-1.0.68 vendor/anymap vendor/arbitrary vendor/arrayvec-0.7.0 - vendor/backtrace-0.3.66 + vendor/block-buffer-0.10.2 + vendor/bstr-0.2.17 + vendor/bstr-1.3.0 + vendor/bumpalo-3.11.1 + vendor/bumpalo-3.12.0 + vendor/bytes-1.0.1 vendor/camino-1.0.9 + vendor/camino-1.1.2 + vendor/cargo_metadata-0.14.0 vendor/cargo_metadata-0.15.2 vendor/cc-1.0.73 vendor/cc-1.0.77 + vendor/cc-1.0.78 vendor/chalk-derive vendor/chalk-ir vendor/chalk-recursive vendor/chalk-solve + vendor/clap_complete-4.0.7 vendor/color-eyre vendor/color-spantrace vendor/command-group - vendor/core-foundation-sys-0.8.0 + vendor/core-foundation + vendor/core-foundation-sys-0.8.3 + vendor/cpufeatures-0.2.5 vendor/cranelift-bforest vendor/cranelift-codegen vendor/cranelift-codegen-meta @@ -86,9 +97,14 @@ Files-Excluded: vendor/cranelift-module vendor/cranelift-native vendor/cranelift-object + vendor/crossbeam-channel-0.5.6 + vendor/crossbeam-deque-0.8.2 + vendor/crossbeam-epoch-0.9.13 + vendor/crossbeam-utils-0.8.14 vendor/crypto-common-0.1.3 vendor/ctor-0.1.22 vendor/ctor + vendor/ctrlc vendor/derive_arbitrary vendor/diff-0.1.12 vendor/digest-0.10.3 @@ -97,10 +113,14 @@ Files-Excluded: vendor/dot vendor/either-1.6.0 vendor/either-1.6.1 + vendor/either-1.8.0 vendor/ena-0.14.0 + vendor/errno-0.3.0 vendor/eyre + vendor/fastrand-1.8.0 vendor/filetime-0.2.16 vendor/filetime-0.2.19 + vendor/filetime-0.2.20 vendor/form_urlencoded-1.0.1 vendor/fsevent-sys vendor/fs_extra @@ -108,20 +128,30 @@ Files-Excluded: vendor/fwdansi vendor/fxhash vendor/generic-array-0.14.4 + vendor/generic-array-0.14.5 + vendor/getrandom-0.2.8 + vendor/gimli-0.27.0 + vendor/glob-0.3.0 vendor/globset-0.4.8 + vendor/globset-0.4.9 + vendor/hashbrown-0.13.1 vendor/heck-0.3.3 + vendor/heck-0.4.0 vendor/hermit-abi-0.3.0 vendor/hex-0.4.2 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index - vendor/home-0.5.3 + vendor/home-0.5.4 + vendor/humantime-2.0.1 vendor/idna-0.2.0 + vendor/ignore-0.4.18 vendor/indenter vendor/indexmap-1.9.2 vendor/inotify vendor/inotify-sys vendor/io-lifetimes-1.0.3 - vendor/is-terminal-0.4.4 + vendor/io-lifetimes-1.0.9 + vendor/is-terminal-0.4.6 vendor/itoa-1.0.2 vendor/itoa-1.0.5 vendor/jemalloc-sys @@ -131,80 +161,115 @@ Files-Excluded: vendor/kqueue-sys vendor/libc-0.2.138 vendor/libc-0.2.139 + vendor/libc-0.2.140 + vendor/libc-0.2.143 vendor/libffi vendor/libffi-sys vendor/libloading-0.7.1 vendor/libmimalloc-sys vendor/libnghttp2-sys vendor/linked-hash-map + vendor/linux-raw-sys-0.3.2 vendor/lock_api-0.4.7 vendor/log-0.4.14 - vendor/lzma-sys-0.1.16 + vendor/lzma-sys-0.1.17 vendor/mach vendor/matches vendor/memmap2-0.5.8 + vendor/memoffset-0.7.1 vendor/mimalloc vendor/mio vendor/miow-0.3.7 vendor/miow + vendor/nix + vendor/nom-7.1.0 vendor/notify vendor/ntapi vendor/num_cpus-1.13.1 + vendor/num-traits-0.2.12 vendor/object-0.30.1 + vendor/object-0.30.2 vendor/once_cell-1.12.0 vendor/once_cell-1.16.0 vendor/once_cell-1.17.0 - vendor/oorandom + vendor/opener-0.5.0 vendor/openssl-src + vendor/openssl-sys-0.9.85 vendor/output_vt100 vendor/owo-colors vendor/parking_lot_core-0.8.5 vendor/parking_lot_core-0.9.4 + vendor/parking_lot_core-0.9.6 vendor/paste vendor/percent-encoding-2.1.0 + vendor/pest-2.5.2 + vendor/pest_derive-2.5.2 + vendor/pest_generator-2.5.2 + vendor/pest_meta-2.5.2 vendor/pin-project-lite-0.2.8 - vendor/proc-macro2-1.0.46 + vendor/pkg-config-0.3.25 + vendor/ppv-lite86-0.2.8 vendor/proc-macro2-1.0.50 + vendor/proc-macro2-1.0.56 vendor/protobuf vendor/protobuf-support + vendor/pulldown-cmark-0.9.2 vendor/pulldown-cmark-to-cmark - vendor/quote-1.0.18 vendor/quote-1.0.23 + vendor/rand_chacha-0.3.0 vendor/rayon-1.5.3 vendor/rayon-1.6.0 + vendor/rayon-1.6.1 + vendor/rayon-core-1.10.1 vendor/rayon-core-1.9.3 vendor/redox_syscall-0.2.10 vendor/redox_syscall-0.2.13 vendor/regalloc2 vendor/regex-1.5.6 + vendor/regex-1.7.1 vendor/regex-syntax-0.6.26 + vendor/regex-syntax-0.6.28 vendor/region vendor/rustc-build-sysroot + vendor/rustix-0.37.6 + vendor/rustix-0.37.7 vendor/ryu-1.0.10 + vendor/ryu-1.0.12 vendor/ryu-1.0.5 vendor/salsa vendor/salsa-macros + vendor/schannel-0.1.19 vendor/schannel vendor/scip vendor/scoped-tls-1.0.0 vendor/security-framework vendor/security-framework-sys vendor/semver-1.0.12 - vendor/serde-1.0.137 + vendor/semver-1.0.16 vendor/serde-1.0.152 - vendor/serde_derive-1.0.137 vendor/serde_derive-1.0.152 vendor/serde_json-1.0.81 vendor/serde_json-1.0.85 + vendor/serde_json-1.0.91 vendor/sha2-0.10.2 vendor/sharded-slab-0.1.1 vendor/slice-group-by + vendor/socket2-0.4.1 vendor/syn-1.0.102 + vendor/syn-1.0.107 + vendor/syn-2.0.8 + vendor/tar-0.4.38 vendor/target-lexicon + vendor/tempfile-3.3.0 vendor/termcolor-1.1.3 + vendor/thiserror-1.0.38 + vendor/thiserror-impl-1.0.38 + vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl vendor/tikv-jemalloc-sys + vendor/time-0.3.17 + vendor/tinyvec_macros-0.1.0 vendor/toml-0.5.7 vendor/tracing-0.1.35 vendor/tracing-attributes-0.1.22 @@ -216,40 +281,50 @@ Files-Excluded: vendor/typed-arena vendor/typenum-1.15.0 vendor/ui_test + vendor/unicode-bidi-0.3.10 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/unicode-ident-1.0.6 vendor/url-2.2.2 + vendor/vcpkg-0.2.10 + vendor/walkdir-2.3.2 vendor/wasmtime-jit-icache-coherence + vendor/winapi + vendor/winapi-i686-pc-windows-gnu vendor/winapi-util - vendor/windows-0.43.0 - vendor/windows_aarch64_gnullvm-0.42.0 + vendor/winapi-x86_64-pc-windows-gnu + vendor/windows-0.46.0 vendor/windows_aarch64_gnullvm-0.42.1 + vendor/windows_aarch64_gnullvm-0.42.2 vendor/windows_aarch64_gnullvm - vendor/windows_aarch64_msvc-0.42.0 vendor/windows_aarch64_msvc-0.42.1 + vendor/windows_aarch64_msvc-0.42.2 vendor/windows_aarch64_msvc vendor/windows - vendor/windows_i686_gnu-0.42.0 vendor/windows_i686_gnu-0.42.1 + vendor/windows_i686_gnu-0.42.2 vendor/windows_i686_gnu - vendor/windows_i686_msvc-0.42.0 vendor/windows_i686_msvc-0.42.1 + vendor/windows_i686_msvc-0.42.2 vendor/windows_i686_msvc vendor/windows-sys-0.42.0 + vendor/windows-sys-0.45.0 vendor/windows-sys + vendor/windows-targets-0.42.1 + vendor/windows-targets-0.42.2 vendor/windows-targets - vendor/windows_x86_64_gnu-0.42.0 vendor/windows_x86_64_gnu-0.42.1 + vendor/windows_x86_64_gnu-0.42.2 vendor/windows_x86_64_gnu - vendor/windows_x86_64_gnullvm-0.42.0 vendor/windows_x86_64_gnullvm-0.42.1 + vendor/windows_x86_64_gnullvm-0.42.2 vendor/windows_x86_64_gnullvm - vendor/windows_x86_64_msvc-0.42.0 vendor/windows_x86_64_msvc-0.42.1 + vendor/windows_x86_64_msvc-0.42.2 vendor/windows_x86_64_msvc vendor/xattr-0.2.2 + vendor/xz2-0.1.6 vendor/yaml-merge-keys vendor/yaml-rust # DO NOT EDIT above, AUTOGENERATED @@ -280,7 +355,6 @@ Files: C*.md version x.py .cargo/config.toml - .gitmodules Copyright: 2006-2009 Graydon Hoare 2009-2012 Mozilla Foundation 2012-2017 The Rust Project Developers (see AUTHORS.txt) @@ -321,9 +395,15 @@ Copyright: 2019-2022 Tom Kaitchuck <Tom.Kaitchuck@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/tkaitchuck/ahash +Files: vendor/android_system_properties/* +Copyright: 2022-2022 Nicolas Silva <nical@fastmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/nical/android_system_properties + Files: vendor/anstream/* vendor/anstyle/* + vendor/anstyle-0.*/* vendor/anstyle-parse/* Copyright: 2023 Ed Page <eopage@gmail.com> License: MIT or Apache-2.0 @@ -341,9 +421,8 @@ License: MIT OR Apache-2.0 Comment: see https://github.com/djc/askama Files: - extra/bitflags/* - extra/bitflags-1.3.*/* vendor/bitflags/* + vendor/bitflags-1.*/* vendor/cc/* vendor/cmake/* vendor/env_logger/* @@ -354,9 +433,9 @@ Files: vendor/log/* vendor/regex/* vendor/regex-syntax/* + vendor/regex-syntax-0.*/* vendor/rustc-hash/* vendor/time/* - vendor/time-0.*/* Copyright: 2010-2021 The Rust Project Developers License: MIT or Apache-2.0 Comment: @@ -372,9 +451,7 @@ Copyright: 2019-2023 Jacob Pratt <open-source@jhpratt.dev> License: MIT OR Apache-2.0 Comment: see https://github.com/time-rs/time -Files: - vendor/core-foundation/* - vendor/core-foundation-sys/* +Files: vendor/core-foundation-sys/* Copyright: 2012-2024 The Servo Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/servo/core-foundation-rs @@ -417,7 +494,6 @@ Files: vendor/cfg-if/* vendor/filetime/* vendor/flate2/* - vendor/flate2-1.0.*/* vendor/fnv/* vendor/jobserver/* vendor/lzma-sys/* @@ -525,11 +601,29 @@ Copyright: 2014-2023 Alex Crichton <alex@alexcrichton.com> License: MIT OR Apache-2.0 Comment: see https://github.com/dtolnay/basic-toml +Files: vendor/bincode/* +Copyright: 2014-2024 Ty Overby <ty@pre-alpha.com> + 2014-2024 Francesco Mazzoli <f@mazzo.li> + 2014-2024 David Tolnay <dtolnay@gmail.com> + 2014-2024 Zoey Riordan <zoey@dos.cafe> +License: MIT +Comment: see https://github.com/servo/bincode + Files: vendor/bitmaps/* Copyright: 2019-2024 Bodil Stokke <bodil@bodil.org> License: MPL-2.0+ Comment: see https://github.com/bodil/bitmaps +Files: vendor/bit-set/* +Copyright: 2015-2023 Alexis Beingessner <a.beingessner@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/contain-rs/bit-set + +Files: vendor/bit-vec/* +Copyright: 2015-2023 Alexis Beingessner <a.beingessner@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/contain-rs/bit-vec + Files: vendor/base16ct/* vendor/base64ct/* @@ -548,6 +642,7 @@ Files: vendor/p384/* vendor/pem-rfc7468/* vendor/pkcs8/* + vendor/primeorder/* vendor/rfc6979/* vendor/sec1/* vendor/sha1/* @@ -567,9 +662,7 @@ Comment: see https://github.com/RustCrypto/KDFs see https://github.com/RustCrypto/MACs -Files: - vendor/bstr/* - vendor/bstr-0.*/* +Files: vendor/bstr/* Copyright: 2018-2024 Andrew Gallant <jamslam@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/BurntSushi/bstr @@ -626,7 +719,7 @@ Comment: see https://github.com/withoutboats/camino Files: vendor/cargo_metadata/* - vendor/cargo_metadata-0.14.0/* + vendor/cargo_metadata-0.*/* Copyright: 2016-2020 Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> License: MIT Comment: @@ -637,6 +730,11 @@ Copyright: 2019-2022 The Cargo Project Developers License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang/cargo +Files: vendor/cast/* +Copyright: 2014-2021 Jorge Aparicio <jorge@japaric.io> +License: MIT OR Apache-2.0 +Comment: see https://github.com/japaric/cast.rs + Files: vendor/ppv-lite86/* Copyright: 2019-2019 The CryptoCorrosion Contributors License: MIT or Apache-2.0 @@ -660,8 +758,11 @@ Comment: see https://github.com/chronotope/chrono Files: vendor/clap/* + vendor/clap-2.*/* vendor/clap-3.*/* + vendor/clap-4.*/* vendor/clap_builder/* + vendor/clap_builder-4.*/* vendor/clap_complete/* vendor/clap_derive/* vendor/clap_derive-3.*/* @@ -676,6 +777,11 @@ Copyright: 2020-2023 marmeladema <xademax@gmail.com> License: MIT Comment: see https://github.com/marmeladema/clru-rs +Files: vendor/codespan-reporting/* +Copyright: 2018-2024 Brendan Zabarauskas <bjzaba@yahoo.com.au> +License: Apache-2.0 +Comment: see https://github.com/brendanzab/codespan + Files: vendor/colored/* Copyright: 2016-2020 Thomas Wickham <mackwic@gmail.com> License: MPL-2.0 @@ -684,8 +790,6 @@ Comment: see https://github.com/mackwic/colored Files: vendor/concolor-override/* vendor/concolor-query/* - vendor/concolor-query-0.1.*/* - vendor/concolor/* Copyright: 2021-2023 Ed Page <eopage@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-cli/concolor @@ -718,6 +822,14 @@ License: MIT OR Apache-2.0 Comment: see https://github.com/srijs/rust-crc32fast Files: + vendor/criterion/* + vendor/criterion-plot/* +Copyright: 2014-2024 Jorge Aparicio <japaricious@gmail.com> + 2014-2024 Brook Heisler <brookheisler@gmail.com> +License: Apache-2.0 or MIT +Comment: see https://github.com/bheisler/criterion.rs + +Files: vendor/crossbeam-channel/* vendor/crossbeam-deque/* vendor/crossbeam-epoch/* @@ -731,6 +843,13 @@ Copyright: 2018-2020 Xidorn Quan <me@upsuper.org> License: MIT Comment: see https://github.com/upsuper/cstr +Files: + vendor/csv/* + vendor/csv-core/* +Copyright: 2014-2023 Andrew Gallant <jamslam@gmail.com> +License: Unlicense or MIT +Comment: see https://github.com/BurntSushi/rust-csv + Files: vendor/ct-codecs/* Copyright: 2020-2022 Frank Denis <github@pureftpd.org> License: MIT @@ -743,6 +862,15 @@ Copyright: 2014-2024 Alex Crichton <alex@alexcrichton.com> License: MIT Comment: see https://github.com/alexcrichton/curl-rust +Files: + vendor/cxx/* + vendor/cxx-build/* + vendor/cxxbridge-flags/* + vendor/cxxbridge-macro/* +Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/cxx + Files: vendor/dashmap/* Copyright: 2019-2022 Acrimon <joel.wejdenstal@gmail.com> License: MIT @@ -775,6 +903,7 @@ Files: vendor/anyhow/* vendor/dissimilar/* vendor/itoa/* + vendor/itoa-0.*/* vendor/quote/* vendor/syn/* vendor/syn-1.*/* @@ -859,9 +988,7 @@ 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/* - vendor/errno-*/* +Files: 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 @@ -902,6 +1029,11 @@ Copyright: 2015-2024 Fiat Crypto library authors <jgross@mit.edu> License: MIT OR Apache-2.0 OR BSD-1-Clause-fiat-crypto Comment: see https://github.com/mit-plv/fiat-crypto +Files: vendor/field-offset/* +Copyright: 2016-2023 Diggory Blake <diggsey@googlemail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/Diggsey/rust-field-offset + Files: vendor/fluent-bundle/* vendor/fluent-syntax/* @@ -983,9 +1115,11 @@ Files: vendor/gix-diff/* vendor/gix-discover/* vendor/gix-features/* + vendor/gix-fs/* vendor/gix-glob/* vendor/gix-hash/* vendor/gix-hashtable/* + vendor/gix-ignore/* vendor/gix-index/* vendor/gix-lock/* vendor/gix-mailmap/* @@ -1005,6 +1139,7 @@ Files: vendor/gix-transport/* vendor/gix-traverse/* vendor/gix-url/* + vendor/gix-utils/* vendor/gix-validate/* vendor/gix-worktree/* Copyright: 2018-2024 Sebastian Thiel <sebastian.thiel@icloud.com> @@ -1022,6 +1157,11 @@ Copyright: 2020 Vishnunarayan K I <appukuttancr@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/vn-ki/gsgdt-rs +Files: vendor/half/* +Copyright: 2016-2024 Kathryn Long <squeeself@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/starkat99/half-rs + Files: vendor/handlebars/* vendor/handlebars-3.5.*/* @@ -1079,6 +1219,15 @@ License: MIT or Apache-2.0 Comment: see https://github.com/lfairy/if_chain Files: + vendor/iana-time-zone/* + vendor/iana-time-zone-haiku/* +Copyright: 2020-2024 Andrew Straw <strawman@astraw.com> + 2020-2024 René Kijewski <rene.kijewski@fu-berlin.de> + 2020-2024 Ryan Lopopolo <rjl@hyperbo.la> +License: MIT OR Apache-2.0 +Comment: see https://github.com/strawlab/iana-time-zone + +Files: vendor/form_urlencoded/* vendor/idna/* vendor/percent-encoding/* @@ -1148,13 +1297,46 @@ Copyright: 2014-2023 Alex Crichton License: MIT or Apache-2.0 Comment: - see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/js-sys + see https://github.com/rustwasm/wasm-bindgen + +Files: vendor/web-sys/* +Copyright: 2018-2024 The wasm-bindgen Developers +License: MIT or Apache-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + +Files: vendors/web-sys/webidls/enabled/MediaCapabilities.webidl +Copyright: 2018 the Contributors to the Media Capabilities Specification +License: MPL-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + +Files: vendor/web-sys/webidls/enabled/*.webidl + vendor/web-sys/webidls/unavailable_option_primitive/*.webidl + vendor/web-sys/webidls/unstable/*.webidl +Copyright: + 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA. + 2012-2018 W3C® (MIT, ERCIM, Keio) +License: MPL-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + +Files: vendor/web-sys/webidls/enabled/PointerEvent.webidl +Copyright: 2013 Microsoft Open Technologies, Inc. */ +License: MPL-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys Files: vendor/jsonpath_lib/* Copyright: 2018-2021 Changseok Han <freestrings@gmail.com> License: MIT Comment: see https://github.com/freestrings/jsonpath +Files: vendor/kstring/* +Copyright: 2014-2024 Ed Page <eopage@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/cobalt-org/kstring + Files: vendor/lazycell/* Copyright: 2016-2020 Alex Crichton <alex@alexcrichton.com> 2016-2020 Nikita Pekin <contact@nikitapek.in> @@ -1168,13 +1350,21 @@ Comment: see https://github.com/rust-lang-nursery/lazy-static.rs see https://github.com/Kimundi/owning-ref-rs +Files: vendor/leb128/* +Copyright: 2016-2022 Nick Fitzgerald <fitzgen@gmail.com> + 2016-2022 Philip Craig <philipjcraig@gmail.com> +License: Apache-2.0 or MIT +Comment: see https://github.com/gimli-rs/leb128 + Files: vendor/libloading/* Copyright: 2015-2022 Simonas Kazlauskas <libloading@kazlauskas.me> License: ISC Comment: see https://github.com/nagisa/rust_libloading/ -Files: vendor/libm/* -Copyright: 2018-2021 Jorge Aparicio <jorge@japaric.io> +Files: + vendor/libm/* + vendor/libm-0.*/* +Copyright: 2018-2024 Jorge Aparicio <jorge@japaric.io> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang-nursery/libm @@ -1191,9 +1381,12 @@ Copyright: 2014-2024 Alex Crichton <alex@alexcrichton.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang/libz-sys -Files: - vendor/linux-raw-sys/* - vendor/linux-raw-sys-0.*/* +Files: vendor/link-cplusplus/* +Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/link-cplusplus + +Files: vendor/linux-raw-sys/* 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 @@ -1262,9 +1455,7 @@ License: MIT Comment: see https://github.com/GuillaumeGomez/minifier-rs -Files: - vendor/miniz_oxide/* - vendor/miniz_oxide-0*/* +Files: vendor/miniz_oxide/* Copyright: 2017-2020 Frommi <daniil.liferenko@gmail.com> License: MIT Comment: see https://github.com/Frommi/miniz_oxide @@ -1275,16 +1466,6 @@ Copyright: 2014-2018 Matt Brubeck <mbrubeck@limpet.net> License: MIT Comment: see https://github.com/mbrubeck/rust-debug-unreachable -Files: vendor/nix/* -Copyright: 2014-2024 The nix-rust Project Developers -License: MIT -Comment: see https://github.com/nix-rust/nix - -Files: vendor/nom8/* -Copyright: 2014-2024 UNKNOWN AUTHORS -License: MIT -Comment: see https://github.com/epage/nom-experimental - Files: vendor/normalize-line-endings/* Copyright: 2016-2018 Richard Dodd <richdodj@gmail.com> License: Apache-2.0 @@ -1327,6 +1508,11 @@ Copyright: 2018-2019 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/matklad/once_cell +Files: vendor/oorandom/* +Copyright: 2019-2021 Simon Heath <icefox@dreamquest.io> +License: MIT +Comment: see https://sr.ht/~icefox/oorandom/ + Files: vendor/opener/* Copyright: 2018-2020 Brian Bowman <seeker14491@gmail.com> License: MIT OR Apache-2.0 @@ -1402,6 +1588,13 @@ Copyright: 2018-2021 Gonzalo Brito Gadeschi <gonzalobg88@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang-nursery/packed_simd +Files: + vendor/partial_ref/* + vendor/partial_ref_derive/* +Copyright: 2018-2021 Jannis Harder <me@jix.one> +License: MIT or Apache-2.0 +Comment: see https://github.com/jix/partial_ref + Files: vendor/pasetors/* Copyright: 2020-2024 brycx <brycx@protonmail.com> License: MIT @@ -1457,6 +1650,14 @@ License: Apache-2.0 or MIT Comment: see https://github.com/taiki-e/pin-project-lite +Files: + vendor/plotters/* + vendor/plotters-backend/* + vendor/plotters-svg/* +Copyright: 2019-2024 Hao Hou <haohou302@gmail.com> +License: MIT +Comment: see https://github.com/plotters-rs/plotters + Files: vendor/precomputed-hash/* Copyright: 2017-2017 Emilio Cobos Álvarez <emilio@crisal.io> License: MIT @@ -1491,6 +1692,11 @@ Copyright: 2020-2023 Sebastian Thiel <sebastian.thiel@icloud.com> License: MIT Comment: see https://github.com/Byron/prodash +Files: vendor/proptest/* +Copyright: 2017-2024 Jason Lingle +License: MIT or Apache-2.0 +Comment: see https://github.com/proptest-rs/proptest + Files: vendor/psm/* Copyright: 2015-2020 Simonas Kazlauskas <git@kazlauskas.me> License: MIT or Apache-2.0 @@ -1538,7 +1744,9 @@ Copyright: 2017-2021 Jose Narvaez <goyox86@gmail.com> License: MIT Comment: see https://gitlab.redox-os.org/redox-os/users -Files: vendor/redox_syscall/* +Files: + vendor/redox_syscall/* + vendor/redox_syscall-0.*/* Copyright: 2016-2021 Jeremy Soller <jackpot51@gmail.com> License: MIT Comment: @@ -1576,6 +1784,10 @@ Copyright: 2020-2020 flip1995 <hello@philkrones.com> License: MIT OR Apache-2.0 Comment: see https://github.com/flip1995/rustc-semver +Files: vendor/rustc-workspace-hack/* +Copyright: 2024 Alex Crichton <alex@alexcrichton.com> +License: MIT or Apache-2.0 + Files: vendor/rustc_version/* Copyright: 2015-2021 Dirkjan Ochtman <dirkjan@ochtman.nl> 2015-2021 Marvin Löbel <loebel.marvin@gmail.com> @@ -1589,9 +1801,7 @@ Copyright: License: Apache-2.0 or MIT Comment: see https://github.com/killercup/rustfix -Files: - vendor/rustix/* - vendor/rustix-0.*/* +Files: vendor/rustix/* 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 @@ -1602,11 +1812,26 @@ Copyright: 2019-2021 David Tolnay <dtolnay@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/dtolnay/rustversion +Files: vendor/rusty-fork/* +Copyright: 2018-2020 Jason Lingle +License: MIT or Apache-2.0 +Comment: see https://github.com/altsysrq/rusty-fork + +Files: vendor/ruzstd/* +Copyright: 2019-2024 Moritz Borcherding <moritz.borcherding@web.de> +License: MIT +Comment: see https://github.com/KillingSpark/zstd-rs + Files: vendor/ryu/* Copyright: 2018-2018 David Tolnay <dtolnay@gmail.com> License: Apache-2.0 or BSL-1.0 Comment: see https://github.com/dtolnay/ryu +Files: vendor/scratch/* +Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/scratch + Files: vendor/self_cell/* Copyright: 2020-2021 Lukas Bergdoll <lukas.bergdoll@gmail.com> License: Apache-2.0 @@ -1629,6 +1854,12 @@ Comment: see https://github.com/serde-rs/serde see https://github.com/serde-rs/json +Files: vendor/serde_cbor/* +Copyright: 2015-2021 Pyfisch <pyfisch@posteo.org> + 2015-2021 Steven Fackler <sfackler@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/pyfisch/cbor + Files: vendor/serde_derive/* Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com> 2016-2017 David Tolnay <dtolnay@gmail.com> @@ -1829,8 +2060,10 @@ Copyright: 2018-2021 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/text-size -Files: vendor/textwrap/* -Copyright: 2016-2022 Martin Geisler <martin@geisler.net> +Files: + vendor/textwrap/* + vendor/textwrap-0.*/* +Copyright: 2016-2024 Martin Geisler <martin@geisler.net> License: MIT Comment: see https://github.com/mgeisler/textwrap @@ -1858,17 +2091,22 @@ Copyright: 2015-2021 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-threadpool/rust-threadpool +Files: vendor/time-macros/* +Copyright: 2019-2024 Jacob Pratt <open-source@jhpratt.dev> + 2019-2024 Time contributors +License: MIT OR Apache-2.0 +Comment: see https://github.com/time-rs/time + Files: vendor/tinystr/* Copyright: 2019-2022 Raph Levien <raph.levien@gmail.com> 2019-2022 Zibi Braniecki <zibi@braniecki.net> License: Apache-2.0 or MIT Comment: see https://github.com/zbraniecki/tinystr -Files: vendor/time-macros/* -Copyright: 2019-2024 Jacob Pratt <open-source@jhpratt.dev> - 2019-2024 Time contributors -License: MIT OR Apache-2.0 -Comment: see https://github.com/time-rs/time +Files: vendor/tinytemplate/* +Copyright: 2018-2022 Brook Heisler <brookheisler@gmail.com> +License: Apache-2.0 OR MIT +Comment: see https://github.com/bheisler/TinyTemplate Files: vendor/tinyvec/* Copyright: 2020 Lokathor <zefria@gmail.com> @@ -1936,11 +2174,32 @@ Copyright: 2015-2019 Paho Lurie-Gregg <paho@paholg.com> License: MIT or Apache-2.0 Comment: see https://github.com/paholg/typenum +Files: vendor/unarray/* +Copyright: 2022 Cameron <cameron.studdstreet@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/cameron1024/unarray + Files: vendor/unicode-bom/* Copyright: 2018-2023 Phil Booth <pmbooth@gmail.com> License: Apache-2.0 Comment: see https://gitlab.com/philbooth/unicode-bom +Files: + vendor/varisat/* + vendor/varisat-checker/* + vendor/varisat-dimacs/* + vendor/varisat-formula/* + vendor/varisat-internal-macros/* + vendor/varisat-internal-proof/* +Copyright: 2018-2022 Jannis Harder <me@jix.one> +License: MIT or Apache-2.0 +Comment: see https://github.com/jix/varisat + +Files: vendor/vec_mut_scan/* +Copyright: 2019-2023 Jannis Harder <me@jix.one> +License: 0BSD +Comment: see https://github.com/jix/vec_mut_scan + Files: vendor/version_check/* Copyright: 2017-2019 Sergio Benitez <sb@sergio.bz> License: MIT or Apache-2.0 @@ -2044,22 +2303,38 @@ Copyright: 2014-2023 Ashley Mannix<ashleymannix@live.com.au> License: Apache-2.0 OR MIT Comment: see https://github.com/uuid-rs/uuid +Files: vendor/wait-timeout/* +Copyright: 2015-2021 Alex Crichton <alex@alexcrichton.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/wait-timeout + Files: vendor/wasi/* Copyright: 2019-2020 The Cranelift Project Developers License: Apache-2.0 with LLVM exception or Apache-2.0 or MIT Comment: see https://github.com/CraneStation/rust-wasi -Files: vendor/winapi/* -Copyright: - 2014-2019 Peter Atashian <retep998@gmail.com> - 2014-2019 winapi-rs developers -License: MIT -Comment: see https://github.com/retep998/winapi-rs +Files: + vendor/windows-bindgen/* + vendor/windows-tokens/* +Copyright: 2019-2024 Microsoft +License: MIT OR Apache-2.0 +Comment: see https://github.com/microsoft/windows-rs -Files: vendor/winapi-*-pc-windows-gnu/* -Copyright: 2014-2018 Peter Atashian <retep998@gmail.com> +Files: vendor/windows-metadata/* +Copyright: Microsoft 2024 License: MIT or Apache-2.0 -Comment: see https://github.com/retep998/winapi-rs +Comment: + see https://github.com/microsoft/windows-rs + this contains pre-generated files which are also MIT or Apache-2.0 licensed, + see vendor/windows-metadata/default/readme.md + +Files: vendor/winnow/* +Copyright: + 2023 winnow contributors + 2014-2023 nom contributors + 2014-2023 Geoffroy Couprie <contact@geoffroycouprie.com> +License: MIT +Comment: see https://github.com/winnow-rs/winnow Files: vendor/xattr/* Copyright: 2015-2017 Steven Allen <steven@stebalien.com> diff --git a/debian/libstd-rust-1.70.lintian-overrides b/debian/libstd-rust-1.70.lintian-overrides deleted file mode 100644 index cfb4b9186..000000000 --- a/debian/libstd-rust-1.70.lintian-overrides +++ /dev/null @@ -1,13 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.70 binary: package-name-doesnt-match-sonames -libstd-rust-1.70 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.70 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.70 binary: shlib-without-versioned-soname -libstd-rust-1.70 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.70 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.70.install b/debian/libstd-rust-1.71.install index cd4545cca..cd4545cca 100644 --- a/debian/libstd-rust-1.70.install +++ b/debian/libstd-rust-1.71.install diff --git a/debian/libstd-rust-1.71.lintian-overrides b/debian/libstd-rust-1.71.lintian-overrides new file mode 100644 index 000000000..d9c4d25cf --- /dev/null +++ b/debian/libstd-rust-1.71.lintian-overrides @@ -0,0 +1,13 @@ +# "libstd" just seemed too generic +libstd-rust-1.71 binary: package-name-doesnt-match-sonames +libstd-rust-1.71 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.71 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.71 binary: shlib-without-versioned-soname +libstd-rust-1.71 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.71 binary: library-not-linked-against-libc diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch index 2e99a9e9a..3f8926877 100644 --- a/debian/patches/c-2002_disable-net-tests.patch +++ b/debian/patches/c-2002_disable-net-tests.patch @@ -51,7 +51,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/publish.rs +++ rust/src/tools/cargo/tests/testsuite/publish.rs -@@ -85,7 +85,7 @@ fn validate_upload_li() { +@@ -88,7 +88,7 @@ fn validate_upload_li() { ); } @@ -60,7 +60,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn simple() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -127,7 +127,7 @@ You may press ctrl-c to skip waiting; th +@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; th // Check that the `token` key works at the root instead of under a // `[registry]` table. @@ -69,7 +69,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn simple_publish_with_http() { let _reg = registry::RegistryBuilder::new() .http_api() -@@ -167,7 +167,7 @@ You may press ctrl-c to skip waiting; th +@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; th .run(); } @@ -78,7 +78,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn simple_publish_with_asymmetric() { let _reg = registry::RegistryBuilder::new() .http_api() -@@ -210,7 +210,7 @@ You may press ctrl-c to skip waiting; th +@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; th .run(); } @@ -87,7 +87,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn old_token_location() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -267,7 +267,7 @@ You may press ctrl-c [..] +@@ -270,7 +270,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } @@ -96,7 +96,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn simple_with_index() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -312,7 +312,7 @@ You may press ctrl-c [..] +@@ -315,7 +315,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } @@ -105,7 +105,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn git_deps() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -350,7 +350,7 @@ the `git` specification will be removed +@@ -353,7 +353,7 @@ the `git` specification will be removed .run(); } @@ -114,7 +114,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn path_dependency_no_version() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -390,7 +390,7 @@ the `path` specification will be removed +@@ -393,7 +393,7 @@ the `path` specification will be removed .run(); } @@ -123,7 +123,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn unpublishable_crate() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -423,7 +423,7 @@ fn unpublishable_crate() { +@@ -426,7 +426,7 @@ fn unpublishable_crate() { .run(); } @@ -132,7 +132,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn dont_publish_dirty() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -465,7 +465,7 @@ to proceed despite this and include the +@@ -468,7 +468,7 @@ to proceed despite this and include the .run(); } @@ -141,7 +141,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_clean() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -513,7 +513,7 @@ You may press ctrl-c to skip waiting; th +@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; th // Other tests will verify the endpoint gets the right payload. } @@ -150,7 +150,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_in_sub_repo() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -562,7 +562,7 @@ You may press ctrl-c [..] +@@ -565,7 +565,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } @@ -159,7 +159,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_when_ignored() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -611,7 +611,7 @@ You may press ctrl-c [..] +@@ -614,7 +614,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } @@ -168,7 +168,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn ignore_when_crate_ignored() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -659,7 +659,7 @@ You may press ctrl-c [..] +@@ -662,7 +662,7 @@ You may press ctrl-c [..] // Other tests will verify the endpoint gets the right payload. } @@ -177,7 +177,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn new_crate_rejected() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -692,7 +692,7 @@ fn new_crate_rejected() { +@@ -695,7 +695,7 @@ fn new_crate_rejected() { .run(); } @@ -186,7 +186,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn dry_run() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -735,7 +735,7 @@ See [..] +@@ -738,7 +738,7 @@ See [..] assert!(!registry::api_path().join("api/v1/crates/new").exists()); } @@ -195,7 +195,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn registry_not_in_publish_list() { let p = project() .file( -@@ -768,7 +768,7 @@ The registry `alternative` is not listed +@@ -771,7 +771,7 @@ The registry `alternative` is not listed .run(); } @@ -204,7 +204,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_empty_list() { let p = project() .file( -@@ -797,7 +797,7 @@ fn publish_empty_list() { +@@ -800,7 +800,7 @@ fn publish_empty_list() { .run(); } @@ -213,7 +213,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_allowed_registry() { let _registry = RegistryBuilder::new() .http_api() -@@ -857,7 +857,7 @@ You may press ctrl-c [..] +@@ -860,7 +860,7 @@ You may press ctrl-c [..] ); } @@ -222,7 +222,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_implicitly_to_only_allowed_registry() { let _registry = RegistryBuilder::new() .http_api() -@@ -918,7 +918,7 @@ You may press ctrl-c [..] +@@ -921,7 +921,7 @@ You may press ctrl-c [..] ); } @@ -231,7 +231,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_fail_with_no_registry_specified() { let p = project().build(); -@@ -952,7 +952,7 @@ The registry `crates-io` is not listed i +@@ -955,7 +955,7 @@ The registry `crates-io` is not listed i .run(); } @@ -240,7 +240,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn block_publish_no_registry() { let p = project() .file( -@@ -982,7 +982,7 @@ fn block_publish_no_registry() { +@@ -985,7 +985,7 @@ fn block_publish_no_registry() { } // Explicitly setting `crates-io` in the publish list. @@ -249,7 +249,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_crates_io_explicit() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1035,7 +1035,7 @@ You may press ctrl-c [..] +@@ -1038,7 +1038,7 @@ You may press ctrl-c [..] .run(); } @@ -258,7 +258,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_select_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1086,7 +1086,7 @@ You may press ctrl-c [..] +@@ -1089,7 +1089,7 @@ You may press ctrl-c [..] .run(); } @@ -267,7 +267,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_all_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1137,7 +1137,7 @@ You may press ctrl-c [..] +@@ -1140,7 +1140,7 @@ You may press ctrl-c [..] .run(); } @@ -276,7 +276,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_no_default_features() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1173,7 +1173,7 @@ fn publish_with_no_default_features() { +@@ -1176,7 +1176,7 @@ fn publish_with_no_default_features() { .run(); } @@ -285,7 +285,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_patch() { let registry = RegistryBuilder::new().http_api().http_index().build(); Package::new("bar", "1.0.0").publish(); -@@ -1278,7 +1278,7 @@ You may press ctrl-c [..] +@@ -1282,7 +1282,7 @@ You may press ctrl-c [..] ); } @@ -294,7 +294,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_checks_for_token_before_verify() { let registry = registry::RegistryBuilder::new() .no_configure_token() -@@ -1327,7 +1327,7 @@ fn publish_checks_for_token_before_verif +@@ -1331,7 +1331,7 @@ fn publish_checks_for_token_before_verif .run(); } @@ -303,7 +303,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_bad_source() { let p = project() .file( -@@ -1376,7 +1376,7 @@ include `--registry crates-io` to use cr +@@ -1380,7 +1380,7 @@ include `--registry crates-io` to use cr } // A dependency with both `git` and `version`. @@ -312,7 +312,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_git_with_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -1519,7 +1519,7 @@ You may press ctrl-c [..] +@@ -1524,7 +1524,7 @@ You may press ctrl-c [..] ); } @@ -321,7 +321,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_dev_dep_no_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -1608,7 +1608,7 @@ repository = "foo" +@@ -1614,7 +1614,7 @@ repository = "foo" ); } @@ -330,7 +330,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn credentials_ambiguous_filename() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1664,7 +1664,7 @@ You may press ctrl-c [..] +@@ -1670,7 +1670,7 @@ You may press ctrl-c [..] // --index will not load registry.token to avoid possibly leaking // crates.io token to another server. @@ -339,7 +339,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn index_requires_token() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1699,7 +1699,7 @@ fn index_requires_token() { +@@ -1705,7 +1705,7 @@ fn index_requires_token() { } // publish with source replacement without --registry @@ -348,7 +348,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn cratesio_source_replacement() { registry::init(); let p = project() -@@ -1728,7 +1728,7 @@ include `--registry dummy-registry` or ` +@@ -1734,7 +1734,7 @@ include `--registry dummy-registry` or ` .run(); } @@ -357,7 +357,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_missing_readme() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1773,7 +1773,7 @@ Caused by: +@@ -1782,7 +1782,7 @@ Caused by: } // Registry returns an API error. @@ -366,7 +366,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_json() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1821,7 +1821,7 @@ Caused by: +@@ -1830,7 +1830,7 @@ Caused by: } // Registry returns an API error with a 200 status code. @@ -375,7 +375,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_200() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1869,7 +1869,7 @@ Caused by: +@@ -1878,7 +1878,7 @@ Caused by: } // Registry returns an error code without a JSON message. @@ -384,7 +384,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_code() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1923,7 +1923,7 @@ Caused by: +@@ -1932,7 +1932,7 @@ Caused by: } // Registry has a network error. @@ -393,7 +393,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_curl_error() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1973,7 +1973,7 @@ Caused by: +@@ -1982,7 +1982,7 @@ Caused by: } // Registry returns an invalid response. @@ -402,7 +402,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_other_error() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -2023,7 +2023,7 @@ Caused by: +@@ -2032,7 +2032,7 @@ Caused by: .run(); } @@ -411,7 +411,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -2074,7 +2074,7 @@ You may press ctrl-c [..] +@@ -2084,7 +2084,7 @@ You may press ctrl-c [..] validate_upload_li(); } @@ -420,7 +420,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn with_duplicate_spec_in_members() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2126,7 +2126,7 @@ fn with_duplicate_spec_in_members() { +@@ -2136,7 +2136,7 @@ fn with_duplicate_spec_in_members() { .run(); } @@ -429,7 +429,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_with_members_with_features_old() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -2176,7 +2176,7 @@ You may press ctrl-c [..] +@@ -2187,7 +2187,7 @@ You may press ctrl-c [..] validate_upload_li(); } @@ -438,7 +438,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_virtual_workspace() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2212,7 +2212,7 @@ fn in_virtual_workspace() { +@@ -2223,7 +2223,7 @@ fn in_virtual_workspace() { .run(); } @@ -447,7 +447,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_virtual_workspace_with_p() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -2269,7 +2269,7 @@ You may press ctrl-c [..] +@@ -2281,7 +2281,7 @@ You may press ctrl-c [..] .run(); } @@ -456,7 +456,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_not_found() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2314,7 +2314,7 @@ error: package ID specification `li` did +@@ -2326,7 +2326,7 @@ error: package ID specification `li` did .run(); } @@ -465,7 +465,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_found_multiple() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2371,7 +2371,7 @@ error: the `-p` argument must be specifi +@@ -2383,7 +2383,7 @@ error: the `-p` argument must be specifi .run(); } @@ -474,7 +474,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs // https://github.com/rust-lang/cargo/issues/10536 fn publish_path_dependency_without_workspace() { // Use local registry for faster test times since no publish will occur -@@ -2418,7 +2418,7 @@ error: package ID specification `bar` di +@@ -2430,7 +2430,7 @@ error: package ID specification `bar` di .run(); } @@ -483,7 +483,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn http_api_not_noop() { let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -2479,7 +2479,7 @@ You may press ctrl-c [..] +@@ -2491,7 +2491,7 @@ You may press ctrl-c [..] p.cargo("build").run(); } @@ -492,7 +492,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_first_publish() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2561,7 +2561,7 @@ You may press ctrl-c to skip waiting; th +@@ -2573,7 +2573,7 @@ You may press ctrl-c to skip waiting; th /// A separate test is needed for package names with - or _ as they hit /// the responder twice per cargo invocation. If that ever gets changed /// this test will need to be changed accordingly. @@ -501,7 +501,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_first_publish_underscore() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2657,7 +2657,7 @@ You may press ctrl-c to skip waiting; th +@@ -2669,7 +2669,7 @@ You may press ctrl-c to skip waiting; th p.cargo("build").with_status(0).run(); } @@ -510,7 +510,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_subsequent_publish() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2749,7 +2749,7 @@ You may press ctrl-c to skip waiting; th +@@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th p.cargo("check").with_status(0).run(); } diff --git a/debian/patches/c-disable-fs-specific-test.patch b/debian/patches/c-disable-fs-specific-test.patch index eda4f925b..ccdc0ba81 100644 --- a/debian/patches/c-disable-fs-specific-test.patch +++ b/debian/patches/c-disable-fs-specific-test.patch @@ -2,7 +2,7 @@ Index: rust/src/tools/cargo/tests/testsuite/metadata.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/metadata.rs +++ rust/src/tools/cargo/tests/testsuite/metadata.rs -@@ -3935,7 +3935,7 @@ fn dep_kinds_workspace() { +@@ -3988,7 +3988,7 @@ fn dep_kinds_workspace() { // Creating non-utf8 path is an OS-specific pain, so let's run this only on // linux, where arbitrary bytes work. #[cfg(target_os = "linux")] diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch index b004ed095..8fe7c1ca9 100644 --- a/debian/patches/c-update-libgit2.patch +++ b/debian/patches/c-update-libgit2.patch @@ -2,31 +2,31 @@ Index: rust/src/tools/cargo/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/Cargo.toml +++ rust/src/tools/cargo/Cargo.toml -@@ -28,8 +28,8 @@ curl-sys = "0.4.61" - env_logger = "0.10.0" +@@ -33,8 +33,8 @@ env_logger = "0.10.0" filetime = "0.2.9" flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } --git2 = "0.17.0" + fwdansi = "1.1.0" +-git2 = "0.17.1" -git2-curl = "0.18.0" -+git2 = "0.18.0" ++git2 = "0.18" +git2-curl = "0.19.0" - gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } - gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] } + gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } + gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] } glob = "0.3.0" -@@ -47,7 +47,7 @@ jobserver = "0.1.26" - lazy_static = "1.2.0" +@@ -53,7 +53,7 @@ jobserver = "0.1.26" + lazy_static = "1.3.0" lazycell = "1.2.0" - libc = "0.2" --libgit2-sys = "0.15.0" + libc = "0.2.144" +-libgit2-sys = "0.15.1" +libgit2-sys = "0.16.1" - log = "0.4.6" + log = "0.4.17" memchr = "2.1.3" - opener = "0.5" + miow = "0.5.0" Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml +++ rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml -@@ -14,7 +14,7 @@ cargo-util = { path = "../cargo-util" } +@@ -15,7 +15,7 @@ cargo-util = { path = "../cargo-util" } crates-io = { path = "../crates-io" } filetime = "0.2" flate2 = { version = "1.0", default-features = false, features = ["zlib"] } diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 3b11a1b63..e90237fa8 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -3,22 +3,18 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules --- - Cargo.toml | 17 ----------------- - src/bootstrap/bootstrap.py | 4 ---- - 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 | 4 +++- - 9 files changed, 15 insertions(+), 62 deletions(-) + Cargo.toml | 11 +++----- + src/bootstrap/bootstrap.py | 4 --- + src/bootstrap/builder.rs | 54 +++++++++----------------------------- + src/bootstrap/test.rs | 12 +-------- + src/tools/rust-analyzer/Cargo.toml | 11 +++++++- + 5 files changed, 28 insertions(+), 64 deletions(-) -Index: rust/Cargo.toml -=================================================================== ---- rust.orig/Cargo.toml -+++ rust/Cargo.toml -@@ -18,28 +18,18 @@ members = [ +diff --git a/Cargo.toml b/Cargo.toml +index 8eb378a..70487ec 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -18,22 +18,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -26,12 +22,6 @@ Index: rust/Cargo.toml - "src/tools/remote-test-server", "src/tools/rust-installer", "src/tools/rust-demangler", - "src/tools/cargo", - "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", @@ -47,11 +37,11 @@ Index: rust/Cargo.toml "src/tools/replace-version-placeholder", "src/tools/lld-wrapper", "src/tools/collect-license-metadata", -Index: rust/src/bootstrap/bootstrap.py -=================================================================== ---- rust.orig/src/bootstrap/bootstrap.py -+++ rust/src/bootstrap/bootstrap.py -@@ -781,10 +781,6 @@ class RustBuild(object): +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +index 58d1926..527282d 100644 +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -899,10 +899,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] args.extend("--verbose" for _ in range(verbose_count)) @@ -62,11 +52,11 @@ Index: rust/src/bootstrap/bootstrap.py if self.get_toml("metrics", "build"): args.append("--features") args.append("build-metrics") -Index: rust/src/bootstrap/builder.rs -=================================================================== ---- rust.orig/src/bootstrap/builder.rs -+++ rust/src/bootstrap/builder.rs -@@ -491,20 +491,20 @@ impl<'a> ShouldRun<'a> { +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index 2fa4455..3f3e5ec 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -492,20 +492,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -99,7 +89,7 @@ Index: rust/src/bootstrap/builder.rs submodules_paths }; -@@ -658,24 +658,14 @@ impl<'a> Builder<'a> { +@@ -672,25 +672,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -120,11 +110,12 @@ Index: rust/src/bootstrap/builder.rs - tool::Miri, - tool::CargoMiri, - llvm::Lld, -- llvm::CrtBeginEnd +- llvm::CrtBeginEnd, +- tool::RustdocGUITest, ), Kind::Check | Kind::Clippy | Kind::Fix => describe!( check::Std, -@@ -683,11 +673,6 @@ impl<'a> Builder<'a> { +@@ -698,11 +687,6 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -136,15 +127,15 @@ Index: rust/src/bootstrap/builder.rs check::Rustfmt, check::Bootstrap ), -@@ -717,7 +702,6 @@ impl<'a> Builder<'a> { - test::ReplacePlaceholderTest, +@@ -730,7 +714,6 @@ impl<'a> Builder<'a> { + test::TierCheck, test::Cargotest, test::Cargo, - test::RustAnalyzer, test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -734,7 +717,6 @@ impl<'a> Builder<'a> { +@@ -746,7 +729,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -152,7 +143,7 @@ Index: rust/src/bootstrap/builder.rs test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -771,7 +753,6 @@ impl<'a> Builder<'a> { +@@ -783,7 +765,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -160,7 +151,7 @@ Index: rust/src/bootstrap/builder.rs doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -787,12 +768,9 @@ impl<'a> Builder<'a> { +@@ -801,12 +782,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -173,7 +164,7 @@ Index: rust/src/bootstrap/builder.rs dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -809,11 +786,9 @@ impl<'a> Builder<'a> { +@@ -823,11 +801,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -185,15 +176,15 @@ Index: rust/src/bootstrap/builder.rs install::LlvmTools, install::Src, install::Rustc -@@ -824,7 +798,6 @@ impl<'a> Builder<'a> { +@@ -837,7 +813,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, - run::Miri, run::CollectLicenseMetadata, run::GenerateCopyright, - ), -@@ -1949,10 +1922,7 @@ impl<'a> Builder<'a> { + run::GenerateWindowsSys, +@@ -1979,10 +1954,7 @@ impl<'a> Builder<'a> { } } @@ -205,11 +196,11 @@ Index: rust/src/bootstrap/builder.rs cargo.arg("--frozen"); } -Index: rust/src/bootstrap/test.rs -=================================================================== ---- rust.orig/src/bootstrap/test.rs -+++ rust/src/bootstrap/test.rs -@@ -2070,17 +2070,7 @@ impl Step for RustcGuide { +diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs +index 44cd84b..9b37d5d 100644 +--- a/src/bootstrap/test.rs ++++ b/src/bootstrap/test.rs +@@ -2004,17 +2004,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -228,10 +219,10 @@ Index: rust/src/bootstrap/test.rs } } -Index: rust/src/tools/rust-analyzer/Cargo.toml -=================================================================== ---- rust.orig/src/tools/rust-analyzer/Cargo.toml -+++ rust/src/tools/rust-analyzer/Cargo.toml +diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml +index 333f03c..2a0faa2 100644 +--- a/src/tools/rust-analyzer/Cargo.toml ++++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ [workspace] -members = ["xtask/", "lib/*", "crates/*"] @@ -248,16 +239,3 @@ Index: rust/src/tools/rust-analyzer/Cargo.toml exclude = ["crates/proc-macro-test/imp"] [workspace.package] -Index: rust/src/tools/rustc-workspace-hack/Cargo.toml -=================================================================== ---- rust.orig/src/tools/rustc-workspace-hack/Cargo.toml -+++ rust/src/tools/rustc-workspace-hack/Cargo.toml -@@ -74,7 +74,7 @@ features = [ - [dependencies] - bstr = { version = "0.2.17", features = ["default"] } - clap = { version = "3.1.1", features = ["derive", "clap_derive"]} --curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } -+curl-sys = { version = "0.4.13", features = ["http2"], optional = true } - # Ensure `extra_traits` of libc, which is used transitively by Cargo. - libc = { version = "0.2", features = ["extra_traits"] } - # Ensure `js` of getrandom, which is (unfortunately) used transitively by Cargo. diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch index 20cb4fd73..9e49580b1 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -7,11 +7,11 @@ Subject: d-0001-pkg-config-no-special-snowflake vendor/pkg-config/tests/test.rs | 2 -- 2 files changed, 10 insertions(+), 17 deletions(-) -Index: rust/vendor/pkg-config/src/lib.rs -=================================================================== ---- rust.orig/vendor/pkg-config/src/lib.rs -+++ rust/vendor/pkg-config/src/lib.rs -@@ -111,11 +111,8 @@ pub enum Error { +diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs +index e9395be..2f6819c 100644 +--- a/vendor/pkg-config/src/lib.rs ++++ b/vendor/pkg-config/src/lib.rs +@@ -117,11 +117,8 @@ pub enum Error { /// Contains the name of the responsible environment variable. EnvNoPkgConfig(String), @@ -25,7 +25,7 @@ Index: rust/vendor/pkg-config/src/lib.rs CrossCompilation, /// Failed to run `pkg-config`. -@@ -155,14 +152,6 @@ impl fmt::Display for Error { +@@ -161,14 +158,6 @@ impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { match *self { Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name), @@ -40,7 +40,7 @@ Index: rust/vendor/pkg-config/src/lib.rs Error::Command { ref command, ref cause, -@@ -219,7 +208,7 @@ impl fmt::Display for Error { +@@ -226,7 +215,7 @@ impl fmt::Display for Error { )?; format_output(output, f) } @@ -49,7 +49,7 @@ Index: rust/vendor/pkg-config/src/lib.rs } } } -@@ -411,6 +400,8 @@ impl Config { +@@ -418,6 +407,8 @@ impl Config { if host == target { return true; } @@ -58,7 +58,7 @@ Index: rust/vendor/pkg-config/src/lib.rs // pkg-config may not be aware of cross-compilation, and require // a wrapper script that sets up platform-specific prefixes. -@@ -470,7 +461,11 @@ impl Config { +@@ -477,7 +468,11 @@ impl Config { fn command(&self, name: &str, args: &[&str]) -> Command { let exe = self .targetted_env_var("PKG_CONFIG") @@ -71,11 +71,11 @@ Index: rust/vendor/pkg-config/src/lib.rs let mut cmd = Command::new(exe); if self.is_static(name) { cmd.arg("--static"); -Index: rust/vendor/pkg-config/tests/test.rs -=================================================================== ---- rust.orig/vendor/pkg-config/tests/test.rs -+++ rust/vendor/pkg-config/tests/test.rs -@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config +diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs +index 4e04ac0..f884e46 100644 +--- a/vendor/pkg-config/tests/test.rs ++++ b/vendor/pkg-config/tests/test.rs +@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> { pkg_config::probe_library(name) } diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index 662b139ae..568bf230f 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -13,10 +13,10 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase vendor/mdbook/src/theme/searcher/mod.rs | 2 - 7 files changed, 47 insertions(+), 240 deletions(-) -Index: rust/src/tools/linkchecker/main.rs -=================================================================== ---- rust.orig/src/tools/linkchecker/main.rs -+++ rust/src/tools/linkchecker/main.rs +diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs +index c8a3700..4095c03 100644 +--- a/src/tools/linkchecker/main.rs ++++ b/src/tools/linkchecker/main.rs @@ -159,7 +159,17 @@ impl Checker { for entry in t!(dir.read_dir()).map(|e| t!(e)) { let path = entry.path(); @@ -66,10 +66,10 @@ Index: rust/src/tools/linkchecker/main.rs if is_exception(file, &target_pretty_path) { report.links_ignored_exception += 1; } else { -Index: rust/vendor/mdbook/src/book/init.rs -=================================================================== ---- rust.orig/vendor/mdbook/src/book/init.rs -+++ rust/vendor/mdbook/src/book/init.rs +diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs +index ebcdd93..41dab42 100644 +--- a/vendor/mdbook/src/book/init.rs ++++ b/vendor/mdbook/src/book/init.rs @@ -153,25 +153,6 @@ impl BookBuilder { let mut js = File::create(themedir.join("book.js"))?; js.write_all(theme::JS)?; @@ -96,11 +96,11 @@ Index: rust/vendor/mdbook/src/book/init.rs Ok(()) } -Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -=================================================================== ---- rust.orig/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -+++ rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, +diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +index e170e2f..caa2eff 100644 +--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs ++++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition}; use crate::errors::*; use crate::renderer::html_handlebars::helpers; use crate::renderer::{RenderContext, Renderer}; @@ -129,10 +129,7 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs - destination, - "FontAwesome/css/font-awesome.css", - theme::FONT_AWESOME, -+ symlink( -+ "/usr/share/fonts-font-awesome/css/font-awesome.min.css", -+ destination.join("css/font-awesome.min.css"), - )?; +- )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.eot", @@ -143,38 +140,41 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs - "FontAwesome/fonts/fontawesome-webfont.svg", - theme::FONT_AWESOME_SVG, + symlink( -+ "/usr/share/fonts-font-awesome/fonts", -+ destination.join("fonts"), ++ "/usr/share/fonts-font-awesome/css/font-awesome.min.css", ++ destination.join("css/font-awesome.min.css"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.ttf", - theme::FONT_AWESOME_TTF, + symlink( -+ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css", -+ destination.join("highlight.css"), ++ "/usr/share/fonts-font-awesome/fonts", ++ destination.join("fonts"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff", - theme::FONT_AWESOME_WOFF, + symlink( -+ "/usr/share/javascript/highlight.js/highlight.js", -+ destination.join("highlight.js"), ++ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css", ++ destination.join("highlight.css"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff2", - theme::FONT_AWESOME_WOFF2, + symlink( -+ "/usr/share/javascript/mathjax/MathJax.js", -+ destination.join("MathJax.js"), ++ "/usr/share/javascript/highlight.js/highlight.js", ++ destination.join("highlight.js"), )?; - write_file( - destination, - "FontAwesome/fonts/FontAwesome.ttf", - theme::FONT_AWESOME_TTF, -- )?; ++ symlink( ++ "/usr/share/javascript/mathjax/MathJax.js", ++ destination.join("MathJax.js"), + )?; - if html_config.copy_fonts { - write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; - for (file_name, contents) in theme::fonts::LICENSES.iter() { @@ -237,11 +237,11 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs Ok(()) } -Index: rust/vendor/mdbook/src/renderer/html_handlebars/search.rs -=================================================================== ---- rust.orig/vendor/mdbook/src/renderer/html_handlebars/search.rs -+++ rust/vendor/mdbook/src/renderer/html_handlebars/search.rs -@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Sear +diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs +index a9e2f5c..3e3f69c 100644 +--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs ++++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs +@@ -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)?; @@ -250,10 +250,10 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/search.rs debug!("Copying search files ✓"); } -Index: rust/vendor/mdbook/src/theme/index.hbs -=================================================================== ---- rust.orig/vendor/mdbook/src/theme/index.hbs -+++ rust/vendor/mdbook/src/theme/index.hbs +diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs +index 6f3948c..7e5c54c 100644 +--- a/vendor/mdbook/src/theme/index.hbs ++++ b/vendor/mdbook/src/theme/index.hbs @@ -33,10 +33,7 @@ {{/if}} @@ -381,10 +381,10 @@ Index: rust/vendor/mdbook/src/theme/index.hbs <!-- Custom JS scripts --> {{#each additional_js}} -Index: rust/vendor/mdbook/src/theme/mod.rs -=================================================================== ---- rust.orig/vendor/mdbook/src/theme/mod.rs -+++ rust/vendor/mdbook/src/theme/mod.rs +diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs +index 6e6b509..ef8886b 100644 +--- a/vendor/mdbook/src/theme/mod.rs ++++ b/vendor/mdbook/src/theme/mod.rs @@ -1,9 +1,5 @@ #![allow(missing_docs)] @@ -395,7 +395,7 @@ Index: rust/vendor/mdbook/src/theme/mod.rs #[cfg(feature = "search")] pub mod searcher; -@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = includ +@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css"); pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png"); pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg"); pub static JS: &[u8] = include_bytes!("book.js"); @@ -461,10 +461,10 @@ Index: rust/vendor/mdbook/src/theme/mod.rs }; assert_eq!(got, empty); -Index: rust/vendor/mdbook/src/theme/searcher/mod.rs -=================================================================== ---- rust.orig/vendor/mdbook/src/theme/searcher/mod.rs -+++ rust/vendor/mdbook/src/theme/searcher/mod.rs +diff --git a/vendor/mdbook/src/theme/searcher/mod.rs b/vendor/mdbook/src/theme/searcher/mod.rs +index d5029db..59eda8a 100644 +--- a/vendor/mdbook/src/theme/searcher/mod.rs ++++ b/vendor/mdbook/src/theme/searcher/mod.rs @@ -2,5 +2,3 @@ //! the "search" cargo feature is disabled. diff --git a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch index 057b7ee8d..53003c7ed 100644 --- a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch +++ b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch @@ -7,11 +7,11 @@ Subject: d-0003-cc-psm-rebuild-wasm32 vendor/psm/build.rs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) -Index: rust/vendor/cc/src/lib.rs -=================================================================== ---- rust.orig/vendor/cc/src/lib.rs -+++ rust/vendor/cc/src/lib.rs -@@ -2389,7 +2389,7 @@ impl Build { +diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs +index abc5d7a..cc1cecc 100644 +--- a/vendor/cc/src/lib.rs ++++ b/vendor/cc/src/lib.rs +@@ -2407,7 +2407,7 @@ impl Build { || target == "wasm32-unknown-wasi" || target == "wasm32-unknown-unknown" { @@ -20,10 +20,10 @@ Index: rust/vendor/cc/src/lib.rs } else if target.contains("vxworks") { if self.cpp { "wr-c++".to_string() -Index: rust/vendor/psm/build.rs -=================================================================== ---- rust.orig/vendor/psm/build.rs -+++ rust/vendor/psm/build.rs +diff --git a/vendor/psm/build.rs b/vendor/psm/build.rs +index 9d40212..e39549d 100644 +--- a/vendor/psm/build.rs ++++ b/vendor/psm/build.rs @@ -50,7 +50,7 @@ fn find_assembly( ("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)), ("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)), diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index 1223fce8b..17254fb53 100644 --- a/debian/patches/d-0005-no-jemalloc.patch +++ b/debian/patches/d-0005-no-jemalloc.patch @@ -7,11 +7,11 @@ Subject: d-0005-no-jemalloc src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 -- 2 files changed, 8 deletions(-) -Index: rust/compiler/rustc/Cargo.toml -=================================================================== ---- rust.orig/compiler/rustc/Cargo.toml -+++ rust/compiler/rustc/Cargo.toml -@@ -14,13 +14,7 @@ rustc_codegen_ssa = { path = "../rustc_c +diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml +index 41003ad..0578f7b 100644 +--- a/compiler/rustc/Cargo.toml ++++ b/compiler/rustc/Cargo.toml +@@ -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" } @@ -25,10 +25,10 @@ Index: rust/compiler/rustc/Cargo.toml 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'] -Index: rust/src/tools/rust-analyzer/crates/profile/Cargo.toml -=================================================================== ---- rust.orig/src/tools/rust-analyzer/crates/profile/Cargo.toml -+++ rust/src/tools/rust-analyzer/crates/profile/Cargo.toml +diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml +index 6273ea5..642fb05 100644 +--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml @@ -17,7 +17,6 @@ cfg-if = "1.0.0" libc = "0.2.135" la-arena = { version = "0.3.0", path = "../../lib/la-arena" } @@ -37,7 +37,7 @@ Index: rust/src/tools/rust-analyzer/crates/profile/Cargo.toml [target.'cfg(target_os = "linux")'.dependencies] perf-event = "0.4.7" -@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = +@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } [features] cpu_profiler = [] diff --git a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch index b386a3a5f..7c31b69d9 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -1,14 +1,17 @@ -Description: Remove embeded C libraries in bundled crates -Author: Zixing Liu <zixing.liu@canonical.com> -Forwarded: not-needed +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0010-cargo-remove-vendored-c-crates + Last-Update: 2023-05-17 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/src/tools/cargo/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/Cargo.toml -+++ rust/src/tools/cargo/Cargo.toml -@@ -114,6 +114,5 @@ test = false + src/tools/cargo/Cargo.toml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml +index 05c95c7..a7475f6 100644 +--- a/src/tools/cargo/Cargo.toml ++++ b/src/tools/cargo/Cargo.toml +@@ -206,8 +206,6 @@ test = false doc = false [features] @@ -16,3 +19,5 @@ Index: rust/src/tools/cargo/Cargo.toml -vendored-libgit2 = ["libgit2-sys/vendored"] +# Debian: removed vendoring flags pretty-env-logger = ["pretty_env_logger"] + # This is primarily used by rust-lang/rust distributing cargo the executable. +-all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx'] diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch index b7ea72c53..00e59567c 100644 --- a/debian/patches/d-0011-cargo-remove-nghttp2.patch +++ b/debian/patches/d-0011-cargo-remove-nghttp2.patch @@ -1,13 +1,16 @@ -Description: Remove nghttp2 from curl-sys crate -Author: Zixing Liu <zixing.liu@canonical.com> -Forwarded: not-needed +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0011-cargo-remove-nghttp2 + Last-Update: 2023-05-17 <YYYY-MM-DD, last update of the meta-information, optional> --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/vendor/curl-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/curl-sys/Cargo.toml -+++ rust/vendor/curl-sys/Cargo.toml + vendor/curl-sys/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml +index 945ee8e..04b9800 100644 +--- a/vendor/curl-sys/Cargo.toml ++++ b/vendor/curl-sys/Cargo.toml @@ -52,7 +52,7 @@ version = "0.3.3" [features] default = ["ssl"] diff --git a/debian/patches/d-0012-cargo-always-return-dev-channel.patch b/debian/patches/d-0012-cargo-always-return-dev-channel.patch index 73554bb89..f643a446f 100644 --- a/debian/patches/d-0012-cargo-always-return-dev-channel.patch +++ b/debian/patches/d-0012-cargo-always-return-dev-channel.patch @@ -1,15 +1,17 @@ -Description: Enable nightly features for Cargo - Debhelper scripts use some nightly features. -Author: Zixing Liu <zixing.liu@canonical.com> -Forwarded: not-needed +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0012-cargo-always-return-dev-channel + Last-Update: 2023-05-30 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/src/tools/cargo/src/cargo/core/features.rs -=================================================================== ---- rust.orig/src/tools/cargo/src/cargo/core/features.rs -+++ rust/src/tools/cargo/src/cargo/core/features.rs -@@ -1182,9 +1182,8 @@ pub fn channel() -> String { + src/tools/cargo/src/cargo/core/features.rs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs +index d56054a..4c2aa4b 100644 +--- a/src/tools/cargo/src/cargo/core/features.rs ++++ b/src/tools/cargo/src/cargo/core/features.rs +@@ -1183,9 +1183,8 @@ pub fn channel() -> String { return "dev".to_string(); } } diff --git a/debian/patches/d-0020-remove-windows-dependencies.patch b/debian/patches/d-0020-remove-windows-dependencies.patch index 0e5230716..624f3bcfd 100644 --- a/debian/patches/d-0020-remove-windows-dependencies.patch +++ b/debian/patches/d-0020-remove-windows-dependencies.patch @@ -1,13 +1,47 @@ -Index: rust/compiler/rustc_data_structures/Cargo.toml +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Mon, 6 May 2024 10:25:32 +0200 +Subject: d-0020-remove-windows-dependencies + =================================================================== ---- rust.orig/compiler/rustc_data_structures/Cargo.toml -+++ rust/compiler/rustc_data_structures/Cargo.toml -@@ -38,16 +38,6 @@ itertools = "0.10.1" +--- + compiler/rustc_codegen_ssa/Cargo.toml | 4 --- + compiler/rustc_data_structures/Cargo.toml | 10 ------ + compiler/rustc_driver_impl/Cargo.toml | 6 ---- + compiler/rustc_errors/Cargo.toml | 8 ----- + compiler/rustc_session/Cargo.toml | 7 ---- + library/backtrace/Cargo.toml | 3 -- + src/bootstrap/Cargo.toml | 15 -------- + src/tools/cargo/Cargo.toml | 17 --------- + .../cargo/crates/cargo-test-support/Cargo.toml | 41 ++++++++++------------ + src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ---- + src/tools/cargo/crates/home/Cargo.toml | 3 -- + src/tools/compiletest/Cargo.toml | 10 ------ + .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ---- + src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 --- + 14 files changed, 19 insertions(+), 122 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml +index 0ac12d3..3f483ab 100644 +--- a/compiler/rustc_codegen_ssa/Cargo.toml ++++ b/compiler/rustc_codegen_ssa/Cargo.toml +@@ -49,7 +49,3 @@ libc = "0.2.50" + version = "0.31.1" + default-features = false + features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"] +- +-[target.'cfg(windows)'.dependencies.windows] +-version = "0.48.0" +-features = ["Win32_Globalization"] +diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml +index 78f73d1..fce2ee0 100644 +--- a/compiler/rustc_data_structures/Cargo.toml ++++ b/compiler/rustc_data_structures/Cargo.toml +@@ -37,16 +37,6 @@ itertools = "0.10.1" [dependencies.parking_lot] version = "0.11" -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", @@ -19,16 +53,16 @@ Index: rust/compiler/rustc_data_structures/Cargo.toml [target.'cfg(not(target_arch = "wasm32"))'.dependencies] memmap2 = "0.2.1" -Index: rust/compiler/rustc_driver_impl/Cargo.toml -=================================================================== ---- rust.orig/compiler/rustc_driver_impl/Cargo.toml -+++ rust/compiler/rustc_driver_impl/Cargo.toml -@@ -54,12 +54,6 @@ rustc_hir_analysis = { path = "../rustc_ +diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml +index 67352c5..f27cb40 100644 +--- a/compiler/rustc_driver_impl/Cargo.toml ++++ b/compiler/rustc_driver_impl/Cargo.toml +@@ -56,12 +56,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" } [target.'cfg(unix)'.dependencies] libc = "0.2" -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.48.0" -features = [ - "Win32_System_Diagnostics_Debug", -] @@ -36,45 +70,75 @@ Index: rust/compiler/rustc_driver_impl/Cargo.toml [features] llvm = ['rustc_interface/llvm'] max_level_info = ['rustc_log/max_level_info'] -Index: rust/compiler/rustc_errors/Cargo.toml -=================================================================== ---- rust.orig/compiler/rustc_errors/Cargo.toml -+++ rust/compiler/rustc_errors/Cargo.toml -@@ -25,14 +25,5 @@ termize = "0.1.1" +diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml +index bd3033f..83c8036 100644 +--- a/compiler/rustc_errors/Cargo.toml ++++ b/compiler/rustc_errors/Cargo.toml +@@ -26,13 +26,5 @@ termize = "0.1.1" serde = { version = "1.0.125", features = [ "derive" ] } serde_json = "1.0.59" -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Security", - "Win32_System_Threading", -- "Win32_System_WindowsProgramming", -] - [features] rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler'] -Index: rust/compiler/rustc_session/Cargo.toml -=================================================================== ---- rust.orig/compiler/rustc_session/Cargo.toml -+++ rust/compiler/rustc_session/Cargo.toml +diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml +index 3af83aa..c3d2a00 100644 +--- a/compiler/rustc_session/Cargo.toml ++++ b/compiler/rustc_session/Cargo.toml @@ -23,10 +23,3 @@ termize = "0.1.1" [target.'cfg(unix)'.dependencies] libc = "0.2" - -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_System_LibraryLoader", -] -Index: rust/src/bootstrap/Cargo.toml -=================================================================== ---- rust.orig/src/bootstrap/Cargo.toml -+++ rust/src/bootstrap/Cargo.toml -@@ -61,25 +61,6 @@ sysinfo = { version = "0.26.0", optional +diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml +index 4779091..aa78771 100644 +--- a/library/backtrace/Cargo.toml ++++ b/library/backtrace/Cargo.toml +@@ -45,9 +45,6 @@ version = "0.30.0" + default-features = false + features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] + +-[target.'cfg(windows)'.dependencies] +-winapi = { version = "0.3.9", optional = true } +- + [build-dependencies] + # Only needed for Android, but cannot be target dependent + # https://github.com/rust-lang/cargo/issues/4932 +@@ -85,16 +82,6 @@ libbacktrace = [] + libunwind = [] + unix-backtrace = [] + verify-winapi = [ +- 'winapi/dbghelp', +- 'winapi/handleapi', +- 'winapi/libloaderapi', +- 'winapi/memoryapi', +- 'winapi/minwindef', +- 'winapi/processthreadsapi', +- 'winapi/synchapi', +- 'winapi/tlhelp32', +- 'winapi/winbase', +- 'winapi/winnt', + ] + + [[example]] +diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml +index 367c619..72c9992 100644 +--- a/src/bootstrap/Cargo.toml ++++ b/src/bootstrap/Cargo.toml +@@ -63,21 +63,6 @@ semver = "1.0.17" [target.'cfg(not(target_os = "solaris"))'.dependencies] fd-lock = "3.0.8" @@ -86,13 +150,9 @@ Index: rust/src/bootstrap/Cargo.toml -features = [ - "Win32_Foundation", - "Win32_Security", -- "Win32_Storage_FileSystem", - "Win32_System_Diagnostics_Debug", -- "Win32_System_IO", -- "Win32_System_Ioctl", - "Win32_System_JobObjects", - "Win32_System_ProcessStatus", -- "Win32_System_SystemServices", - "Win32_System_Threading", - "Win32_System_Time", -] @@ -100,11 +160,132 @@ Index: rust/src/bootstrap/Cargo.toml [dev-dependencies] pretty_assertions = "1.2" -Index: rust/src/tools/compiletest/Cargo.toml -=================================================================== ---- rust.orig/src/tools/compiletest/Cargo.toml -+++ rust/src/tools/compiletest/Cargo.toml -@@ -23,13 +23,3 @@ lazycell = "1.3.0" +diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml +index a7475f6..4ad22f5 100644 +--- a/src/tools/cargo/Cargo.toml ++++ b/src/tools/cargo/Cargo.toml +@@ -2,7 +2,9 @@ + resolver = "2" + members = [ + "crates/*", +- "credential/*", ++ "credential/cargo-credential", ++ "credential/cargo-credential-1password", ++ "credential/cargo-credential-gnome-secret", + "benches/benchsuite", + "benches/capture", + ] +@@ -91,7 +93,6 @@ unicode-xid = "0.2.0" + url = "2.2.2" + varisat = "0.2.1" + walkdir = "2.3.1" +-windows-sys = "0.48" + + [package] + name = "cargo" +@@ -174,22 +175,6 @@ walkdir.workspace = true + [target.'cfg(not(windows))'.dependencies] + openssl = { workspace = true, optional = true } + +-[target.'cfg(windows)'.dependencies] +-fwdansi.workspace = true +- +-[target.'cfg(windows)'.dependencies.windows-sys] +-workspace = true +-features = [ +- "Win32_Foundation", +- "Win32_Storage_FileSystem", +- "Win32_System_Console", +- "Win32_System_IO", +- "Win32_System_Threading", +- "Win32_System_JobObjects", +- "Win32_Security", +- "Win32_System_SystemServices" +-] +- + [dev-dependencies] + cargo-test-macro.workspace = true + cargo-test-support.workspace = true +diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml +index 305c809a..c656678 100644 +--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml ++++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml +@@ -9,25 +9,22 @@ publish = false + doctest = false + + [dependencies] +-anyhow.workspace = true +-cargo-test-macro.workspace = true +-cargo-util.workspace = true +-crates-io.workspace = true +-filetime.workspace = true +-flate2.workspace = true +-git2.workspace = true +-glob.workspace = true +-itertools.workspace = true +-lazy_static.workspace = true +-pasetors.workspace = true +-serde = { workspace = true, features = ["derive"] } +-serde_json.workspace = true +-snapbox.workspace = true +-tar.workspace = true +-termcolor.workspace = true +-time.workspace = true +-toml.workspace = true +-url.workspace = true +- +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] } ++anyhow = "1.0.34" ++cargo-test-macro = { path = "../cargo-test-macro" } ++cargo-util = { path = "../cargo-util" } ++crates-io = { path = "../crates-io" } ++filetime = "0.2" ++flate2 = { version = "1.0", default-features = false, features = ["zlib"] } ++git2 = "0.17.0" ++glob = "0.3" ++itertools = "0.10.0" ++lazy_static = "1.0" ++pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] } ++serde = { version = "1.0.123", features = ["derive"] } ++serde_json = "1.0" ++snapbox = { version = "0.4.0", features = ["diff", "path"] } ++tar = { version = "0.4.38", default-features = false } ++termcolor = "1.1.2" ++time = { version = "0.3", features = ["parsing", "formatting"]} ++toml = "0.7.0" ++url = "2.2.2" +diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml +index f01705f..138690f 100644 +--- a/src/tools/cargo/crates/cargo-util/Cargo.toml ++++ b/src/tools/cargo/crates/cargo-util/Cargo.toml +@@ -19,10 +19,3 @@ same-file.workspace = true + shell-escape.workspace = true + tempfile.workspace = true + walkdir.workspace = true +- +-[target.'cfg(target_os = "macos")'.dependencies] +-core-foundation.workspace = true +- +-[target.'cfg(windows)'.dependencies] +-miow.workspace = true +-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] } +diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml +index 6c65ecc1..11fd255 100644 +--- a/src/tools/cargo/crates/home/Cargo.toml ++++ b/src/tools/cargo/crates/home/Cargo.toml +@@ -15,6 +15,3 @@ license = "MIT OR Apache-2.0" + readme = "README.md" + repository = "https://github.com/rust-lang/cargo" + description = "Shared definitions of home directories." +- +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] } +diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml +index d2f2583..61f7be4 100644 +--- a/src/tools/compiletest/Cargo.toml ++++ b/src/tools/compiletest/Cargo.toml +@@ -27,13 +27,3 @@ anyhow = "1" [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -113,30 +294,15 @@ Index: rust/src/tools/compiletest/Cargo.toml -miow = "0.5" - -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] -Index: rust/src/tools/rust-analyzer/crates/stdx/Cargo.toml -=================================================================== ---- rust.orig/src/tools/rust-analyzer/crates/stdx/Cargo.toml -+++ rust/src/tools/rust-analyzer/crates/stdx/Cargo.toml -@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", option - always-assert = { version = "0.1.2", features = ["log"] } - # Think twice before adding anything here - --[target.'cfg(windows)'.dependencies] --miow = "0.5.0" --winapi = { version = "0.3.9", features = ["winerror"] } -- - [features] - # Uncomment to enable for the whole crate graph - # default = [ "backtrace" ] -Index: rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -=================================================================== ---- rust.orig/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -+++ rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +index f0f1900..3137edb 100644 +--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml @@ -67,12 +67,6 @@ tt.workspace = true vfs-notify.workspace = true vfs.workspace = true @@ -150,64 +316,32 @@ Index: rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml [dev-dependencies] expect-test = "1.4.0" jod-thread = "0.1.2" -Index: rust/src/tools/cargo/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/Cargo.toml -+++ rust/src/tools/cargo/Cargo.toml -@@ -82,22 +82,6 @@ walkdir = "2.2" - # for more information. - rustc-workspace-hack = "1.0.0" +diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml +index 642fb05..0883bb7 100644 +--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml +@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] } + [target.'cfg(target_os = "linux")'.dependencies] + perf-event = "0.4.7" -[target.'cfg(windows)'.dependencies] --fwdansi = "1.1.0" +-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } - --[target.'cfg(windows)'.dependencies.windows-sys] --version = "0.45" --features = [ -- "Win32_Foundation", -- "Win32_Storage_FileSystem", -- "Win32_System_Console", -- "Win32_System_IO", -- "Win32_System_Threading", -- "Win32_System_JobObjects", -- "Win32_Security", -- "Win32_System_SystemServices" --] -- - [dev-dependencies] - cargo-test-macro = { path = "crates/cargo-test-macro" } - cargo-test-support = { path = "crates/cargo-test-support" } -Index: rust/src/tools/cargo/crates/cargo-util/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/crates/cargo-util/Cargo.toml -+++ rust/src/tools/cargo/crates/cargo-util/Cargo.toml -@@ -22,7 +22,3 @@ walkdir = "2.3.1" + [features] + cpu_profiler = [] + +diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml +index c881f2f..5cb4cb0 100644 +--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml +@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", optional = true } + always-assert = { version = "0.1.2", features = ["log"] } + # Think twice before adding anything here - [target.'cfg(target_os = "macos")'.dependencies] - core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] } -- -[target.'cfg(windows)'.dependencies] -miow = "0.5.0" --windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] } -Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml -+++ rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml -@@ -27,6 +27,3 @@ termcolor = "1.1.2" - time = { version = "0.3", features = ["parsing", "formatting"]} - toml = "0.7.0" - url = "2.2.2" -- --[target.'cfg(windows)'.dependencies] --windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem"] } -Index: rust/src/tools/cargo/crates/home/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/crates/home/Cargo.toml -+++ rust/src/tools/cargo/crates/home/Cargo.toml -@@ -15,6 +15,3 @@ license = "MIT OR Apache-2.0" - readme = "README.md" - repository = "https://github.com/rust-lang/cargo" - description = "Shared definitions of home directories." +-winapi = { version = "0.3.9", features = ["winerror"] } - --[target.'cfg(windows)'.dependencies] --windows-sys = { version = "0.45.0", features = ["Win32_Foundation", "Win32_UI_Shell"] } + [features] + # Uncomment to enable for the whole crate graph + # default = [ "backtrace" ] diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 9a2994a34..8796a5c92 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -1,45 +1,177 @@ From 1a6f5062adaad5d7f1a4f1cf792f4ee8c3c17e9f Mon Sep 17 00:00:00 2001 -From: liushuyu <zixing.liu@canonical.com> +From: Fabian Grünbichler <f.gruenbichler@proxmox.com> Date: Wed, 6 Sep 2023 13:23:24 -0600 Subject: [PATCH] Remove Windows dependencies +Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> --- - vendor/anstyle-wincon/Cargo.toml | 7 ------- - vendor/compiletest_rs/Cargo.toml | 3 --- - vendor/concolor-query/Cargo.toml | 7 ------- - vendor/errno/Cargo.toml | 7 ------- - vendor/fd-lock/Cargo.toml | 8 -------- - vendor/filetime/Cargo.toml | 7 ------- - vendor/gix-sec/Cargo.toml | 10 ---------- - vendor/home/Cargo.toml | 7 ------- - vendor/io-lifetimes/Cargo.toml | 13 ------------- - vendor/is-terminal/Cargo.toml | 8 -------- - vendor/parking_lot_core/Cargo.toml | 9 --------- - vendor/rustix/Cargo.toml | 9 --------- - vendor/snapbox/Cargo.toml | 6 ------ - vendor/tempfile/Cargo.toml | 7 ------- - vendor/terminal_size/Cargo.toml | 7 ------- - 15 files changed, 115 deletions(-) + vendor/anstream/Cargo.toml | 6 +---- + vendor/atty/Cargo.toml | 3 --- + vendor/backtrace/Cargo.toml | 13 ----------- + vendor/chrono/Cargo.toml | 11 --------- + vendor/colored/Cargo.toml | 4 ---- + vendor/compiletest_rs/Cargo.toml | 6 ----- + vendor/concolor-query/Cargo.toml | 7 ------ + vendor/ctrlc/Cargo.toml | 18 --------------- + vendor/curl-sys/Cargo.toml | 10 --------- + vendor/curl/Cargo.toml | 10 --------- + vendor/dirs-sys-next/Cargo.toml | 3 --- + vendor/dirs-sys/Cargo.toml | 3 --- + vendor/errno-0.3.0/Cargo.toml | 7 ------ + vendor/errno/Cargo.toml | 6 ----- + vendor/fd-lock/Cargo.toml | 8 ------- + vendor/filetime-0.2.20/Cargo.toml | 7 ------ + vendor/filetime/Cargo.toml | 7 ------ + vendor/gix-discover/Cargo.toml | 3 --- + vendor/gix-sec/Cargo.toml | 13 ----------- + vendor/home-0.5.4/Cargo.toml | 8 ------- + vendor/home/Cargo.toml | 7 ------ + vendor/iana-time-zone/Cargo.toml | 4 ---- + vendor/ignore-0.4.18/Cargo.toml | 2 -- + vendor/ignore/Cargo.toml | 3 --- + vendor/io-close/Cargo.toml | 3 --- + vendor/io-lifetimes-1.0.9/Cargo.toml | 13 ----------- + vendor/io-lifetimes/Cargo.toml | 13 ----------- + vendor/is-terminal-0.4.6/Cargo.toml | 11 --------- + vendor/is-terminal/Cargo.toml | 11 --------- + vendor/libloading/Cargo.toml | 7 ------ + vendor/libssh2-sys/Cargo.toml | 4 ---- + vendor/nu-ansi-term/Cargo.toml | 10 --------- + vendor/opener-0.5.0/Cargo.toml | 3 --- + vendor/opener/Cargo.toml | 4 ---- + vendor/os_info/Cargo.toml | 15 ------------- + vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- + vendor/parking_lot_core-0.9.6/Cargo.toml | 9 -------- + vendor/parking_lot_core/Cargo.toml | 9 -------- + vendor/pretty_assertions/Cargo.toml | 6 ----- + vendor/remove_dir_all/Cargo.toml | 3 --- + vendor/rustix-0.37.6/Cargo.toml | 12 ---------- + vendor/rustix-0.37.7/Cargo.toml | 12 ---------- + vendor/rustix/Cargo.toml | 17 -------------- + vendor/same-file/Cargo.toml | 2 -- + vendor/snapbox/Cargo.toml | 11 --------- + vendor/socket2-0.4.1/Cargo.toml | 3 --- + vendor/socket2/Cargo.toml | 8 ------- + vendor/stacker/Cargo.toml | 10 --------- + vendor/sysinfo/Cargo.toml | 38 -------------------------------- + vendor/tempfile-3.3.0/Cargo.toml | 3 --- + vendor/tempfile/Cargo.toml | 7 ------ + vendor/term/Cargo.toml | 6 ----- + vendor/termcolor/Cargo.toml | 3 --- + vendor/terminal_size/Cargo.toml | 7 ------ + vendor/termize/Cargo.toml | 3 --- + vendor/tokio/Cargo.toml | 6 ----- + vendor/uuid/Cargo.toml | 4 ---- + vendor/walkdir-2.3.2/Cargo.toml | 6 ----- + vendor/walkdir/Cargo.toml | 3 --- + 59 files changed, 1 insertion(+), 462 deletions(-) -Index: rust/vendor/compiletest_rs/Cargo.toml -=================================================================== ---- rust.orig/vendor/compiletest_rs/Cargo.toml -+++ rust/vendor/compiletest_rs/Cargo.toml -@@ -74,10 +74,3 @@ tmp = ["tempfile"] - +diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml +index eb04906..7e2ed64 100644 +--- a/vendor/anstream/Cargo.toml ++++ b/vendor/anstream/Cargo.toml +@@ -137,8 +137,4 @@ default = [ + "auto", + "wincon", + ] +-wincon = ["dep:anstyle-wincon"] +- +-[target."cfg(windows)".dependencies.anstyle-wincon] +-version = "0.2.0" +-optional = true ++wincon = [] +diff --git a/vendor/atty/Cargo.toml b/vendor/atty/Cargo.toml +index d6bf2d0..7cebc31 100644 +--- a/vendor/atty/Cargo.toml ++++ b/vendor/atty/Cargo.toml +@@ -27,8 +27,5 @@ version = "0.1.6" [target."cfg(unix)".dependencies.libc] version = "0.2" + default-features = false +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"] + [badges.travis-ci] + repository = "softprops/atty" +diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml +index 96f4146..4a48f6e 100644 +--- a/vendor/backtrace/Cargo.toml ++++ b/vendor/backtrace/Cargo.toml +@@ -127,18 +127,5 @@ serialize-serde = ["serde"] + std = [] + unix-backtrace = [] + verify-winapi = [ +- "winapi/dbghelp", +- "winapi/handleapi", +- "winapi/libloaderapi", +- "winapi/memoryapi", +- "winapi/minwindef", +- "winapi/processthreadsapi", +- "winapi/synchapi", +- "winapi/tlhelp32", +- "winapi/winbase", +- "winapi/winnt", + ] + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-optional = true +diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml +index eaf0e69..79ab5f9 100644 +--- a/vendor/chrono/Cargo.toml ++++ b/vendor/chrono/Cargo.toml +@@ -114,7 +114,6 @@ __internal_bench = ["criterion"] + alloc = [] + clock = [ + "std", +- "winapi", + "iana-time-zone", + ] + default = [ +@@ -150,13 +149,3 @@ version = "0.3" + version = "0.1.45" + features = ["fallback"] + optional = true - +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.0" +-features = [ +- "std", +- "minwinbase", +- "minwindef", +- "timezoneapi", +-] +-optional = true +diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml +index 3a6b59b..065eecb 100644 +--- a/vendor/colored/Cargo.toml ++++ b/vendor/colored/Cargo.toml +@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3" + + [features] + no-color = [] +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["consoleapi", "processenv", "winbase"] +-default-features = false +diff --git a/vendor/compiletest_rs/Cargo.toml b/vendor/compiletest_rs/Cargo.toml +index c1b3ecd..cae8c30 100644 +--- a/vendor/compiletest_rs/Cargo.toml ++++ b/vendor/compiletest_rs/Cargo.toml +@@ -75,9 +75,3 @@ tmp = ["tempfile"] + [target."cfg(unix)".dependencies.libc] + version = "0.2" + -[target."cfg(windows)".dependencies.miow] -version = "0.3" - -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["winerror"] -Index: rust/vendor/concolor-query/Cargo.toml -=================================================================== ---- rust.orig/vendor/concolor-query/Cargo.toml -+++ rust/vendor/concolor-query/Cargo.toml +diff --git a/vendor/concolor-query/Cargo.toml b/vendor/concolor-query/Cargo.toml +index a25ce89..c578c4c 100644 +--- a/vendor/concolor-query/Cargo.toml ++++ b/vendor/concolor-query/Cargo.toml @@ -33,10 +33,3 @@ keywords = [ categories = ["command-line-interface"] license = "MIT OR Apache-2.0" @@ -51,25 +183,90 @@ Index: rust/vendor/concolor-query/Cargo.toml - "Win32_System_Console", - "Win32_Foundation", -] -Index: rust/vendor/errno/Cargo.toml -=================================================================== ---- rust.orig/vendor/errno/Cargo.toml -+++ rust/vendor/errno/Cargo.toml -@@ -40,10 +40,3 @@ version = "0.2" +diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml +index 04b9800..4a4968d 100644 +--- a/vendor/curl-sys/Cargo.toml ++++ b/vendor/curl-sys/Cargo.toml +@@ -73,16 +73,6 @@ zlib-ng-compat = [ + version = "0.9" + optional = true + +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = [ +- "winsock2", +- "ws2def", +-] +- + [badges.appveyor] + repository = "alexcrichton/curl-rust" + +diff --git a/vendor/curl/Cargo.toml b/vendor/curl/Cargo.toml +index bfb59f4..d9f6854 100644 +--- a/vendor/curl/Cargo.toml ++++ b/vendor/curl/Cargo.toml +@@ -107,16 +107,6 @@ optional = true + version = "0.9.43" + optional = true + +-[target."cfg(target_env = \"msvc\")".dependencies.schannel] +-version = "0.1.13" +- +-[target."cfg(target_env = \"msvc\")".dependencies.winapi] +-version = "0.3" +-features = [ +- "libloaderapi", +- "wincrypt", +-] +- + [badges.appveyor] + repository = "alexcrichton/curl-rust" +diff --git a/vendor/dirs-sys-next/Cargo.toml b/vendor/dirs-sys-next/Cargo.toml +index e9d8d0c..acb2eb7 100644 +--- a/vendor/dirs-sys-next/Cargo.toml ++++ b/vendor/dirs-sys-next/Cargo.toml +@@ -25,8 +25,5 @@ version = "0.4.0" + default-features = false [target."cfg(unix)".dependencies.libc] version = "0.2" -- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] + [badges.maintenance] + status = "as-is" +diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml +index 6c41007..4d79134 100644 +--- a/vendor/dirs-sys/Cargo.toml ++++ b/vendor/dirs-sys/Cargo.toml +@@ -23,6 +23,3 @@ version = "0.4" + default-features = false + [target."cfg(unix)".dependencies.libc] + version = "0.2" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] +diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml +index bf54b1f..7507a31 100644 +--- a/vendor/errno/Cargo.toml ++++ b/vendor/errno/Cargo.toml +@@ -41,9 +41,3 @@ version = "0.2" + [target."cfg(unix)".dependencies.libc] + version = "0.2" + -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45" +-version = "0.48" -features = [ - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] -Index: rust/vendor/fd-lock/Cargo.toml -=================================================================== ---- rust.orig/vendor/fd-lock/Cargo.toml -+++ rust/vendor/fd-lock/Cargo.toml +diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml +index d995177..b759d87 100644 +--- a/vendor/fd-lock/Cargo.toml ++++ b/vendor/fd-lock/Cargo.toml @@ -43,11 +43,3 @@ version = "3.0.8" [target."cfg(unix)".dependencies.rustix] version = "0.37.0" @@ -82,32 +279,35 @@ Index: rust/vendor/fd-lock/Cargo.toml - "Win32_Storage_FileSystem", - "Win32_System_IO", -] -Index: rust/vendor/filetime/Cargo.toml -=================================================================== ---- rust.orig/vendor/filetime/Cargo.toml -+++ rust/vendor/filetime/Cargo.toml +diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml +index 8547ec3..4ecd973 100644 +--- a/vendor/filetime/Cargo.toml ++++ b/vendor/filetime/Cargo.toml @@ -38,10 +38,3 @@ version = "0.2.9" [target."cfg(unix)".dependencies.libc] version = "0.2.27" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", -] -Index: rust/vendor/gix-sec/Cargo.toml -=================================================================== ---- rust.orig/vendor/gix-sec/Cargo.toml -+++ rust/vendor/gix-sec/Cargo.toml -@@ -64,13 +64,3 @@ version = "4" - - [target."cfg(windows)".dependencies.gix-path] - version = "^0.7.1" +diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml +index 44a3e884..041a6bb 100644 +--- a/vendor/gix-sec/Cargo.toml ++++ b/vendor/gix-sec/Cargo.toml +@@ -61,16 +61,3 @@ serde = [ + + [target."cfg(not(windows))".dependencies.libc] + version = "0.2.123" +- +-[target."cfg(windows)".dependencies.gix-path] +-version = "^0.8.0" - -[target."cfg(windows)".dependencies.windows] --version = "0.43.0" +-version = "0.48" -features = [ - "Win32_Foundation", - "Win32_Security_Authorization", @@ -115,25 +315,59 @@ Index: rust/vendor/gix-sec/Cargo.toml - "Win32_System_Memory", - "Win32_System_Threading", -] -Index: rust/vendor/home/Cargo.toml -=================================================================== ---- rust.orig/vendor/home/Cargo.toml -+++ rust/vendor/home/Cargo.toml +diff --git a/vendor/home/Cargo.toml b/vendor/home/Cargo.toml +index cd608b1..eecfb89 100644 +--- a/vendor/home/Cargo.toml ++++ b/vendor/home/Cargo.toml @@ -27,10 +27,3 @@ readme = "README.md" license = "MIT OR Apache-2.0" - repository = "https://github.com/brson/home" - --[target."cfg(windows)".dependencies.winapi] --version = "0.3" + repository = "https://github.com/rust-lang/cargo" + resolver = "2" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" -features = [ -- "shlobj", -- "std", -- "winerror", +- "Win32_Foundation", +- "Win32_UI_Shell", -] -Index: rust/vendor/io-lifetimes/Cargo.toml -=================================================================== ---- rust.orig/vendor/io-lifetimes/Cargo.toml -+++ rust/vendor/io-lifetimes/Cargo.toml +diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml +index 5cdc175..271a062 100644 +--- a/vendor/iana-time-zone/Cargo.toml ++++ b/vendor/iana-time-zone/Cargo.toml +@@ -52,7 +52,3 @@ version = "0.1.5" + + [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] + version = "0.1.1" +- +-[target."cfg(target_os = \"windows\")".dependencies.windows] +-version = "0.48.0" +-features = ["Globalization"] +diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml +index b397dcf..2022a87 100644 +--- a/vendor/ignore/Cargo.toml ++++ b/vendor/ignore/Cargo.toml +@@ -64,6 +64,3 @@ version = "0.5.0" + + [features] + simd-accel = ["globset/simd-accel"] +- +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.2" +diff --git a/vendor/io-close/Cargo.toml b/vendor/io-close/Cargo.toml +index 5e36444..82f9ce5 100644 +--- a/vendor/io-close/Cargo.toml ++++ b/vendor/io-close/Cargo.toml +@@ -28,6 +28,3 @@ optional = true + version = "3.1.0" + [target."cfg(unix)".dependencies.libc] + version = "0.2.80" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = ["handleapi", "std", "winsock2"] +diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml +index b9ed913..0fd300a 100644 +--- a/vendor/io-lifetimes/Cargo.toml ++++ b/vendor/io-lifetimes/Cargo.toml @@ -43,7 +43,6 @@ optional = true close = [ "libc", @@ -148,7 +382,7 @@ Index: rust/vendor/io-lifetimes/Cargo.toml optional = true - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", @@ -158,17 +392,17 @@ Index: rust/vendor/io-lifetimes/Cargo.toml - "Win32_System_Threading", -] -optional = true -Index: rust/vendor/is-terminal/Cargo.toml -=================================================================== ---- rust.orig/vendor/is-terminal/Cargo.toml -+++ rust/vendor/is-terminal/Cargo.toml +diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml +index 7957a9c..0ab2ae1 100644 +--- a/vendor/is-terminal/Cargo.toml ++++ b/vendor/is-terminal/Cargo.toml @@ -53,14 +53,3 @@ features = ["termios"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] version = "0.3.0" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", @@ -177,334 +411,45 @@ Index: rust/vendor/is-terminal/Cargo.toml - -[target."cfg(windows)".dev-dependencies.tempfile] -version = "3" -Index: rust/vendor/parking_lot_core/Cargo.toml -=================================================================== ---- rust.orig/vendor/parking_lot_core/Cargo.toml -+++ rust/vendor/parking_lot_core/Cargo.toml -@@ -58,11 +58,3 @@ version = "0.2.8" - [target."cfg(unix)".dependencies.libc] - version = "0.2.95" +diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml +index 65168d5..7785a7e 100644 +--- a/vendor/libloading/Cargo.toml ++++ b/vendor/libloading/Cargo.toml +@@ -42,10 +42,3 @@ version = "1.1" --[target."cfg(windows)".dependencies.windows-sys] --version = "0.42.0" --features = [ -- "Win32_Foundation", -- "Win32_System_LibraryLoader", -- "Win32_System_SystemServices", -- "Win32_System_WindowsProgramming", --] -Index: rust/vendor/rustix/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix/Cargo.toml -+++ rust/vendor/rustix/Cargo.toml -@@ -233,14 +233,3 @@ package = "errno" - version = "1.5.2" - optional = true - --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_Foundation", -- "Win32_Networking_WinSock", -- "Win32_NetworkManagement_IpHelper", -- "Win32_System_Threading", --] -- --[target."cfg(windows)".dev-dependencies.ctor] --version = "0.1.21" -Index: rust/vendor/tempfile/Cargo.toml -=================================================================== ---- rust.orig/vendor/tempfile/Cargo.toml -+++ rust/vendor/tempfile/Cargo.toml -@@ -38,6 +38,3 @@ nightly = [] - version = "0.2.27" - [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] - version = "0.2.9" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["fileapi", "handleapi", "winbase"] -Index: rust/vendor/terminal_size/Cargo.toml -=================================================================== ---- rust.orig/vendor/terminal_size/Cargo.toml -+++ rust/vendor/terminal_size/Cargo.toml -@@ -30,10 +30,3 @@ repository = "https://github.com/eminenc - [target."cfg(not(windows))".dependencies.rustix] - version = "0.36.3" - features = ["termios"] -- --[target."cfg(windows)".dependencies.windows-sys] --version = "0.42.0" --features = [ -- "Win32_Foundation", -- "Win32_System_Console", --] -Index: rust/vendor/curl/Cargo.toml -=================================================================== ---- rust.orig/vendor/curl/Cargo.toml -+++ rust/vendor/curl/Cargo.toml -@@ -107,16 +107,6 @@ optional = true - version = "0.9.43" - optional = true - --[target."cfg(target_env = \"msvc\")".dependencies.schannel] --version = "0.1.13" -- --[target."cfg(target_env = \"msvc\")".dependencies.winapi] --version = "0.3" --features = [ -- "libloaderapi", -- "wincrypt", --] -- - [badges.appveyor] - repository = "alexcrichton/curl-rust" - -Index: rust/vendor/uuid/Cargo.toml -=================================================================== ---- rust.orig/vendor/uuid/Cargo.toml -+++ rust/vendor/uuid/Cargo.toml -@@ -64,7 +64,7 @@ version = "1.0.56" - - [features] - default = ["std"] --guid = ["winapi"] -+guid = [] - std = [] - stdweb = ["getrandom", "getrandom/js"] - v1 = [] -@@ -72,9 +72,6 @@ v3 = ["md5"] - v4 = ["getrandom"] - v5 = ["sha1"] - wasm-bindgen = ["getrandom", "getrandom/js"] --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --optional = true - [badges.appveyor] - repository = "uuid-rs/uuid" - -Index: rust/vendor/anstream/Cargo.toml -=================================================================== ---- rust.orig/vendor/anstream/Cargo.toml -+++ rust/vendor/anstream/Cargo.toml -@@ -137,8 +137,5 @@ default = [ - "auto", - "wincon", - ] --wincon = ["dep:anstyle-wincon"] -+wincon = [] - --[target."cfg(windows)".dependencies.anstyle-wincon] --version = "0.2.0" --optional = true -Index: rust/vendor/atty/Cargo.toml -=================================================================== ---- rust.orig/vendor/atty/Cargo.toml -+++ rust/vendor/atty/Cargo.toml -@@ -27,8 +27,5 @@ version = "0.1.6" - [target."cfg(unix)".dependencies.libc] - version = "0.2" - default-features = false --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"] - [badges.travis-ci] - repository = "softprops/atty" -Index: rust/vendor/backtrace/Cargo.toml -=================================================================== ---- rust.orig/vendor/backtrace/Cargo.toml -+++ rust/vendor/backtrace/Cargo.toml -@@ -127,18 +127,4 @@ serialize-serde = ["serde"] - std = [] - unix-backtrace = [] - verify-winapi = [ -- "winapi/dbghelp", -- "winapi/handleapi", -- "winapi/libloaderapi", -- "winapi/memoryapi", -- "winapi/minwindef", -- "winapi/processthreadsapi", -- "winapi/synchapi", -- "winapi/tlhelp32", -- "winapi/winbase", -- "winapi/winnt", - ] -- --[target."cfg(windows)".dependencies.winapi] --version = "0.3.9" --optional = true -Index: rust/vendor/chrono/Cargo.toml -=================================================================== ---- rust.orig/vendor/chrono/Cargo.toml -+++ rust/vendor/chrono/Cargo.toml -@@ -93,7 +93,7 @@ version = "1" - __doctest = [] - __internal_bench = [] - alloc = [] --clock = ["libc", "std", "winapi"] -+clock = ["libc", "std"] - default = ["clock", "std", "oldtime"] - oldtime = ["time"] - std = [] -@@ -108,10 +108,6 @@ version = "0.2" - optional = true - [target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test] - version = "0.3" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.0" --features = ["std", "minwinbase", "minwindef", "timezoneapi"] --optional = true - [badges.appveyor] - repository = "chronotope/chrono" - -Index: rust/vendor/colored/Cargo.toml -=================================================================== ---- rust.orig/vendor/colored/Cargo.toml -+++ rust/vendor/colored/Cargo.toml -@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3" - - [features] - no-color = [] --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["consoleapi", "processenv", "winbase"] --default-features = false -Index: rust/vendor/concolor/Cargo.toml -=================================================================== ---- rust.orig/vendor/concolor/Cargo.toml -+++ rust/vendor/concolor/Cargo.toml -@@ -59,7 +59,6 @@ auto = [ - "clicolor", - "no_color", - "term", -- "windows", - ] - clicolor = [ - "core", -@@ -82,7 +81,3 @@ term = [ - "core", - "concolor-query", - ] --windows = [ -- "core", -- "concolor-query/windows", --] -Index: rust/vendor/curl-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/curl-sys/Cargo.toml -+++ rust/vendor/curl-sys/Cargo.toml -@@ -63,7 +63,6 @@ ssl = ["openssl-sys"] - static-curl = [] - static-ssl = ["openssl-sys/vendored"] - upkeep_7_62_0 = [] --windows-static-ssl = [] - zlib-ng-compat = [ - "libz-sys/zlib-ng", - "static-curl", -@@ -73,16 +72,6 @@ zlib-ng-compat = [ - version = "0.9" - optional = true - --[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] --version = "0.2" -- --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = [ -- "winsock2", -- "ws2def", --] -- - [badges.appveyor] - repository = "alexcrichton/curl-rust" - -Index: rust/vendor/dirs-sys-next/Cargo.toml -=================================================================== ---- rust.orig/vendor/dirs-sys-next/Cargo.toml -+++ rust/vendor/dirs-sys-next/Cargo.toml -@@ -25,8 +25,5 @@ version = "0.4.0" - default-features = false - [target."cfg(unix)".dependencies.libc] - version = "0.2" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] - [badges.maintenance] - status = "as-is" -Index: rust/vendor/dirs-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/dirs-sys/Cargo.toml -+++ rust/vendor/dirs-sys/Cargo.toml -@@ -23,6 +23,3 @@ version = "0.4" - default-features = false - [target."cfg(unix)".dependencies.libc] - version = "0.2" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] -Index: rust/vendor/errno-0.2.8/Cargo.toml -=================================================================== ---- rust.orig/vendor/errno-0.2.8/Cargo.toml -+++ rust/vendor/errno-0.2.8/Cargo.toml -@@ -30,6 +30,3 @@ version = "0.2" - version = "0.2" - [target."cfg(unix)".dependencies.libc] - version = "0.2" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["errhandlingapi", "minwindef", "ntdef", "winbase"] -Index: rust/vendor/gix-discover/Cargo.toml -=================================================================== ---- rust.orig/vendor/gix-discover/Cargo.toml -+++ rust/vendor/gix-discover/Cargo.toml -@@ -60,6 +60,3 @@ version = "3.2.0" - - [target."cfg(target_os = \"macos\")".dev-dependencies.defer] - version = "0.1.0" -- --[target."cfg(windows)".dependencies.dunce] --version = "1.0.3" -Index: rust/vendor/ignore/Cargo.toml -=================================================================== ---- rust.orig/vendor/ignore/Cargo.toml -+++ rust/vendor/ignore/Cargo.toml -@@ -57,5 +57,3 @@ version = "0.5.0" - - [features] - simd-accel = ["globset/simd-accel"] --[target."cfg(windows)".dependencies.winapi-util] --version = "0.1.2" -Index: rust/vendor/libloading/Cargo.toml -=================================================================== ---- rust.orig/vendor/libloading/Cargo.toml -+++ rust/vendor/libloading/Cargo.toml -@@ -43,9 +43,3 @@ version = "1.1" [target."cfg(unix)".dependencies.cfg-if] version = "1" - +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = [ - "errhandlingapi", - "libloaderapi", -] -Index: rust/vendor/libssh2-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/libssh2-sys/Cargo.toml -+++ rust/vendor/libssh2-sys/Cargo.toml -@@ -47,9 +47,6 @@ openssl-on-win32 = ["openssl-sys"] +diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml +index 45f4a71..b0d3e26 100644 +--- a/vendor/libssh2-sys/Cargo.toml ++++ b/vendor/libssh2-sys/Cargo.toml +@@ -43,7 +43,6 @@ version = "1.0.25" + version = "0.3.11" + + [features] +-openssl-on-win32 = ["openssl-sys"] vendored-openssl = ["openssl-sys/vendored"] zlib-ng-compat = ["libz-sys/zlib-ng"] --[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] --version = "0.2" -- +@@ -52,7 +51,3 @@ version = "0.2" + [target."cfg(unix)".dependencies.openssl-sys] version = "0.9.35" - -Index: rust/vendor/nu-ansi-term/Cargo.toml -=================================================================== ---- rust.orig/vendor/nu-ansi-term/Cargo.toml -+++ rust/vendor/nu-ansi-term/Cargo.toml +- +-[target."cfg(windows)".dependencies.openssl-sys] +-version = "0.9.35" +-optional = true +diff --git a/vendor/nu-ansi-term/Cargo.toml b/vendor/nu-ansi-term/Cargo.toml +index 209e055..aa40f02 100644 +--- a/vendor/nu-ansi-term/Cargo.toml ++++ b/vendor/nu-ansi-term/Cargo.toml @@ -45,13 +45,3 @@ version = "1.0.39" [features] @@ -519,28 +464,30 @@ Index: rust/vendor/nu-ansi-term/Cargo.toml - "handleapi", - "processenv", -] -Index: rust/vendor/opener/Cargo.toml -=================================================================== ---- rust.orig/vendor/opener/Cargo.toml -+++ rust/vendor/opener/Cargo.toml -@@ -25,9 +25,6 @@ repository = "https://github.com/Seeker1 - version = "0.9" +diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml +index 8d91b5e..2d7313b 100644 +--- a/vendor/opener/Cargo.toml ++++ b/vendor/opener/Cargo.toml +@@ -32,10 +32,6 @@ version = "0.9" [target."cfg(target_os = \"linux\")".dependencies.bstr] - version = "0.2" + version = "1" + -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["shellapi"] +- [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -Index: rust/vendor/os_info/Cargo.toml -=================================================================== ---- rust.orig/vendor/os_info/Cargo.toml -+++ rust/vendor/os_info/Cargo.toml -@@ -48,17 +48,3 @@ version = "1" +diff --git a/vendor/os_info/Cargo.toml b/vendor/os_info/Cargo.toml +index 52a062f..e1f347b 100644 +--- a/vendor/os_info/Cargo.toml ++++ b/vendor/os_info/Cargo.toml +@@ -48,18 +48,3 @@ version = "1" + [features] default = ["serde"] - +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3.8" -features = [ @@ -555,10 +502,10 @@ Index: rust/vendor/os_info/Cargo.toml - "winerror", - "winreg", -] -Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml -=================================================================== ---- rust.orig/vendor/parking_lot_core-0.8.6/Cargo.toml -+++ rust/vendor/parking_lot_core-0.8.6/Cargo.toml +diff --git a/vendor/parking_lot_core-0.8.6/Cargo.toml b/vendor/parking_lot_core-0.8.6/Cargo.toml +index 6981516..9fb8bd2 100644 +--- a/vendor/parking_lot_core-0.8.6/Cargo.toml ++++ b/vendor/parking_lot_core-0.8.6/Cargo.toml @@ -60,15 +60,3 @@ version = "0.2.8" [target."cfg(unix)".dependencies.libc] @@ -575,23 +522,41 @@ Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml - "errhandlingapi", - "handleapi", -] -Index: rust/vendor/pretty_assertions/Cargo.toml -=================================================================== ---- rust.orig/vendor/pretty_assertions/Cargo.toml -+++ rust/vendor/pretty_assertions/Cargo.toml -@@ -43,8 +43,3 @@ default = ["std"] +diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml +index 361186b..e00c191 100644 +--- a/vendor/parking_lot_core/Cargo.toml ++++ b/vendor/parking_lot_core/Cargo.toml +@@ -57,12 +57,3 @@ version = "0.2.8" + + [target."cfg(unix)".dependencies.libc] + version = "0.2.95" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_LibraryLoader", +- "Win32_System_SystemServices", +- "Win32_System_WindowsProgramming", +-] +diff --git a/vendor/pretty_assertions/Cargo.toml b/vendor/pretty_assertions/Cargo.toml +index f8370f7..4531652 100644 +--- a/vendor/pretty_assertions/Cargo.toml ++++ b/vendor/pretty_assertions/Cargo.toml +@@ -42,9 +42,3 @@ alloc = [] + default = ["std"] std = [] unstable = [] - +- -[target."cfg(windows)".dependencies.ctor] -version = "0.1.9" - -[target."cfg(windows)".dependencies.output_vt100] -version = "0.1.2" -Index: rust/vendor/remove_dir_all/Cargo.toml -=================================================================== ---- rust.orig/vendor/remove_dir_all/Cargo.toml -+++ rust/vendor/remove_dir_all/Cargo.toml +diff --git a/vendor/remove_dir_all/Cargo.toml b/vendor/remove_dir_all/Cargo.toml +index a847288..aaf637f 100644 +--- a/vendor/remove_dir_all/Cargo.toml ++++ b/vendor/remove_dir_all/Cargo.toml @@ -23,6 +23,3 @@ license = "MIT/Apache-2.0" repository = "https://github.com/XAMPPRocky/remove_dir_all.git" [dev-dependencies.doc-comment] @@ -599,17 +564,22 @@ Index: rust/vendor/remove_dir_all/Cargo.toml -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"] -Index: rust/vendor/rustix-0.36.5/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.36.5/Cargo.toml -+++ rust/vendor/rustix-0.36.5/Cargo.toml -@@ -222,15 +222,3 @@ package = "errno" +diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml +index c928526..6b7cff3 100644 +--- a/vendor/rustix/Cargo.toml ++++ b/vendor/rustix/Cargo.toml +@@ -233,20 +233,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true - +-[target."cfg(windows)".dependencies.libc_errno] +-version = "0.3.1" +-default-features = false +-package = "errno" +- -[target."cfg(windows)".dependencies.windows-sys] --version = "0.42.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Networking_WinSock", @@ -618,36 +588,63 @@ Index: rust/vendor/rustix-0.36.5/Cargo.toml -] - -[target."cfg(windows)".dev-dependencies.ctor] --version = "0.1.21" -Index: rust/vendor/same-file/Cargo.toml -=================================================================== ---- rust.orig/vendor/same-file/Cargo.toml -+++ rust/vendor/same-file/Cargo.toml +-version = "0.2.0" +diff --git a/vendor/same-file/Cargo.toml b/vendor/same-file/Cargo.toml +index 4f66820..11ef472 100644 +--- a/vendor/same-file/Cargo.toml ++++ b/vendor/same-file/Cargo.toml @@ -25,5 +25,3 @@ license = "Unlicense/MIT" repository = "https://github.com/BurntSushi/same-file" [dev-dependencies.doc-comment] version = "0.3" -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" -Index: rust/vendor/socket2/Cargo.toml -=================================================================== ---- rust.orig/vendor/socket2/Cargo.toml -+++ rust/vendor/socket2/Cargo.toml -@@ -34,6 +34,3 @@ features = ["all"] - all = [] +diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml +index a9a74e1..8b0bf63 100644 +--- a/vendor/snapbox/Cargo.toml ++++ b/vendor/snapbox/Cargo.toml +@@ -161,7 +157,6 @@ cmd = [ + "dep:os_pipe", + "dep:wait-timeout", + "dep:libc", +- "dep:windows-sys", + ] + color = [ + "dep:anstream", +@@ -196,8 +190,3 @@ structured-data = ["dep:serde_json"] [target."cfg(unix)".dependencies.libc] - version = "0.2.96" + version = "0.2.137" + optional = true +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45.0" +-features = ["Win32_Foundation"] +-optional = true +diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml +index 3f1578c..bdac898 100644 +--- a/vendor/socket2/Cargo.toml ++++ b/vendor/socket2/Cargo.toml +@@ -58,11 +58,3 @@ all = [] + + [target."cfg(unix)".dependencies.libc] + version = "0.2.139" +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" --features = ["handleapi", "ws2ipdef", "ws2tcpip"] -Index: rust/vendor/stacker/Cargo.toml -=================================================================== ---- rust.orig/vendor/stacker/Cargo.toml -+++ rust/vendor/stacker/Cargo.toml -@@ -44,12 +44,3 @@ version = "0.1.7" +-features = [ +- "handleapi", +- "ws2ipdef", +- "ws2tcpip", +-] +diff --git a/vendor/stacker/Cargo.toml b/vendor/stacker/Cargo.toml +index 160cbc0..ba02aac 100644 +--- a/vendor/stacker/Cargo.toml ++++ b/vendor/stacker/Cargo.toml +@@ -43,13 +43,3 @@ version = "0.1.7" + [build-dependencies.cc] version = "1.0.2" - +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3.6" -features = [ @@ -657,10 +654,10 @@ Index: rust/vendor/stacker/Cargo.toml - "processthreadsapi", - "minwindef", -] -Index: rust/vendor/sysinfo/Cargo.toml -=================================================================== ---- rust.orig/vendor/sysinfo/Cargo.toml -+++ rust/vendor/sysinfo/Cargo.toml +diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml +index f8719a4..deb2e40 100644 +--- a/vendor/sysinfo/Cargo.toml ++++ b/vendor/sysinfo/Cargo.toml @@ -60,41 +60,3 @@ version = "1.0" [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] @@ -703,34 +700,68 @@ Index: rust/vendor/sysinfo/Cargo.toml - "shellapi", - "std", -] -Index: rust/vendor/term/Cargo.toml -=================================================================== ---- rust.orig/vendor/term/Cargo.toml -+++ rust/vendor/term/Cargo.toml -@@ -31,9 +31,6 @@ default = [] - [target."cfg(windows)".dependencies.rustversion] - version = "1" +diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml +index 85006d8..013e986 100644 +--- a/vendor/tempfile/Cargo.toml ++++ b/vendor/tempfile/Cargo.toml +@@ -50,10 +50,3 @@ features = ["fs"] + [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] + version = "0.3" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45" +-features = [ +- "Win32_Storage_FileSystem", +- "Win32_Foundation", +-] +diff --git a/vendor/term/Cargo.toml b/vendor/term/Cargo.toml +index e89261e..ad5d62b 100644 +--- a/vendor/term/Cargo.toml ++++ b/vendor/term/Cargo.toml +@@ -28,12 +28,6 @@ version = "2" + + [features] + default = [] +-[target."cfg(windows)".dependencies.rustversion] +-version = "1" +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["consoleapi", "wincon", "handleapi", "fileapi"] [badges.appveyor] repository = "Stebalien/term" -Index: rust/vendor/termcolor/Cargo.toml -=================================================================== ---- rust.orig/vendor/termcolor/Cargo.toml -+++ rust/vendor/termcolor/Cargo.toml -@@ -36,5 +36,3 @@ bench = false +diff --git a/vendor/termcolor/Cargo.toml b/vendor/termcolor/Cargo.toml +index dbdb6e8..8edc73e 100644 +--- a/vendor/termcolor/Cargo.toml ++++ b/vendor/termcolor/Cargo.toml +@@ -35,6 +35,3 @@ name = "termcolor" + bench = false [dev-dependencies] - +- -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.3" -Index: rust/vendor/termize/Cargo.toml -=================================================================== ---- rust.orig/vendor/termize/Cargo.toml -+++ rust/vendor/termize/Cargo.toml +diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml +index 9f31164..6d2d6a5 100644 +--- a/vendor/terminal_size/Cargo.toml ++++ b/vendor/terminal_size/Cargo.toml +@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size" + [target."cfg(not(windows))".dependencies.rustix] + version = "0.37.0" + features = ["termios"] +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +-] +diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml +index d248f4d..9bd9f37 100644 +--- a/vendor/termize/Cargo.toml ++++ b/vendor/termize/Cargo.toml @@ -49,8 +49,5 @@ rpath = false [dependencies] [target."cfg(unix)".dependencies.libc] @@ -740,26 +771,11 @@ Index: rust/vendor/termize/Cargo.toml -features = ["handleapi", "processenv", "wincon", "winbase"] [badges.cirrus-ci] repository = "JohnTitor/termize" -Index: rust/vendor/time-0.1.43/Cargo.toml -=================================================================== ---- rust.orig/vendor/time-0.1.43/Cargo.toml -+++ rust/vendor/time-0.1.43/Cargo.toml -@@ -29,10 +29,3 @@ version = "0.3" - optional = true - [dev-dependencies.log] - version = "0.4" -- --[dev-dependencies.winapi] --version = "0.3.0" --features = ["std", "processthreadsapi", "winbase"] --[target."cfg(windows)".dependencies.winapi] --version = "0.3.0" --features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"] -Index: rust/vendor/tokio/Cargo.toml -=================================================================== ---- rust.orig/vendor/tokio/Cargo.toml -+++ rust/vendor/tokio/Cargo.toml -@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macr +diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml +index 11ec0c0..bf2ad39 100644 +--- a/vendor/tokio/Cargo.toml ++++ b/vendor/tokio/Cargo.toml +@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "r io-std = [] io-util = ["memchr", "bytes"] macros = ["tokio-macros"] @@ -784,27 +800,39 @@ Index: rust/vendor/tokio/Cargo.toml -default-features = false -[target."cfg(windows)".dev-dependencies.ntapi] -version = "0.3.6" -Index: rust/vendor/walkdir/Cargo.toml -=================================================================== ---- rust.orig/vendor/walkdir/Cargo.toml -+++ rust/vendor/walkdir/Cargo.toml -@@ -28,12 +28,7 @@ repository = "https://github.com/BurntSu - version = "1.0.1" +diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml +index b783688..4e98553 100644 +--- a/vendor/uuid/Cargo.toml ++++ b/vendor/uuid/Cargo.toml +@@ -180,10 +180,6 @@ package = "wasm-bindgen" + [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] + version = "0.3" + +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48.0" +-features = ["Win32_System_Com"] +- + [badges.is-it-maintained-issue-resolution] + repository = "uuid-rs/uuid" + +diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml +index 7db9263..2a9b56f 100644 +--- a/vendor/walkdir/Cargo.toml ++++ b/vendor/walkdir/Cargo.toml +@@ -39,9 +39,6 @@ version = "1.0.1" [dev-dependencies.doc-comment] version = "0.3" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["std", "winnt"] -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" +- [badges.appveyor] repository = "BurntSushi/walkdir" -Index: rust/vendor/yansi-term/Cargo.toml -=================================================================== ---- rust.orig/vendor/yansi-term/Cargo.toml -+++ rust/vendor/yansi-term/Cargo.toml +diff --git a/vendor/yansi-term/Cargo.toml b/vendor/yansi-term/Cargo.toml +index 0317866..88ce8ef 100644 +--- a/vendor/yansi-term/Cargo.toml ++++ b/vendor/yansi-term/Cargo.toml @@ -36,9 +36,6 @@ version = "1.0" [features] @@ -815,30 +843,3 @@ Index: rust/vendor/yansi-term/Cargo.toml [badges.maintenance] status = "actively-developed" -Index: rust/vendor/snapbox/Cargo.toml -=================================================================== ---- rust.orig/vendor/snapbox/Cargo.toml -+++ rust/vendor/snapbox/Cargo.toml -@@ -154,14 +154,6 @@ optional = true - version = "2.3.2" - optional = true - --[dependencies.winapi] --version = "0.3.9" --features = [ -- "consoleapi", -- "minwindef", --] --optional = true -- - [dependencies.yansi] - version = "0.5.0" - optional = true -@@ -171,7 +163,6 @@ cmd = [ - "dep:os_pipe", - "dep:wait-timeout", - "dep:libc", -- "dep:winapi", - ] - color = [ - "dep:yansi", diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch index 4f7ac94b2..2d542a1e9 100644 --- a/debian/patches/d-armel-fix-lldb.patch +++ b/debian/patches/d-armel-fix-lldb.patch @@ -4,7 +4,7 @@ Index: rust/src/bootstrap/test.rs =================================================================== --- rust.orig/src/bootstrap/test.rs +++ rust/src/bootstrap/test.rs -@@ -1619,7 +1619,11 @@ note: if you're sure you want to do this +@@ -1516,7 +1516,11 @@ note: if you're sure you want to do this .ok(); if let Some(ref vers) = lldb_version { cmd.arg("--lldb-version").arg(vers); diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch index 65fbd07bc..b7e3c457b 100644 --- a/debian/patches/d-bootstrap-cargo-check-cfg.patch +++ b/debian/patches/d-bootstrap-cargo-check-cfg.patch @@ -5,7 +5,7 @@ Index: rust/src/bootstrap/builder.rs =================================================================== --- rust.orig/src/bootstrap/builder.rs +++ rust/src/bootstrap/builder.rs -@@ -1350,9 +1350,9 @@ impl<'a> Builder<'a> { +@@ -1382,9 +1382,9 @@ impl<'a> Builder<'a> { // complete list of features, so for that reason we don't enable checking of // features for std crates. cargo.arg(if mode != Mode::Std { diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index 577bb704e..248dc118c 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -29,8 +29,8 @@ Index: rust/src/doc/edition-guide/src/editions/advanced-migrations.md -[`cargo check`]: ../../cargo/commands/cargo-check.html -[`cargo fix`]: ../../cargo/commands/cargo-fix.html -+[`cargo check`]: ../../../cargo-doc/doc/commands/cargo-check.html -+[`cargo fix`]: ../../../cargo-doc/doc/commands/cargo-fix.html ++[`cargo check`]: ../../../../cargo/book/commands/cargo-check.html ++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html [`explicit-outlives-requirements`]: ../../rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements [`keyword-idents`]: ../../rustc/lints/listing/allowed-by-default.html#keyword-idents [`rustfix`]: https://github.com/rust-lang/rustfix @@ -39,13 +39,13 @@ Index: rust/src/doc/edition-guide/src/editions/advanced-migrations.md -[Cargo package]: ../../cargo/reference/manifest.html#the-package-section -[Cargo targets]: ../../cargo/reference/cargo-targets.html -[Cargo workspace]: ../../cargo/reference/workspaces.html -+[Cargo features]: ../../../cargo-doc/doc/reference/features.html -+[Cargo package]: ../../../cargo-doc/doc/reference/manifest.html#the-package-section -+[Cargo targets]: ../../../cargo-doc/doc/reference/cargo-targets.html -+[Cargo workspace]: ../../../cargo-doc/doc/reference/workspaces.html ++[Cargo features]: ../../../../cargo/book/reference/features.html ++[Cargo package]: ../../../../cargo/book/reference/manifest.html#the-package-section ++[Cargo targets]: ../../../../cargo/book/reference/cargo-targets.html ++[Cargo workspace]: ../../../../cargo/book/reference/workspaces.html [CLI flag]: ../../rustc/lints/levels.html#via-compiler-flag -[Code generation]: ../../cargo/reference/build-script-examples.html#code-generation -+[Code generation]: ../../../cargo-doc/doc/reference/build-script-examples.html#code-generation ++[Code generation]: ../../../../cargo/book/reference/build-script-examples.html#code-generation [conditional compilation]: ../../reference/conditional-compilation.html [documentation tests]: ../../rustdoc/documentation-tests.html [JSON messages]: ../../rustc/json.html @@ -59,8 +59,8 @@ Index: rust/src/doc/edition-guide/src/editions/transitioning-an-existing-project -[`cargo fix`]: ../../cargo/commands/cargo-fix.html -[`cargo test`]: ../../cargo/commands/cargo-test.html -+[`cargo fix`]: ../../../cargo-doc/doc/commands/cargo-fix.html -+[`cargo test`]: ../../../cargo-doc/doc/commands/cargo-test.html ++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html ++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html [Advanced migration strategies]: advanced-migrations.md [nightly channel]: ../../book/appendix-07-nightly-rust.html Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md @@ -72,14 +72,14 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md See [the announcement of Rust 1.51][5] for details. -[4]: ../../cargo/reference/resolver.html#feature-resolver-version-2 -+[4]: ../../../cargo-doc/doc/reference/resolver.html#feature-resolver-version-2 ++[4]: ../../../../cargo/book/reference/resolver.html#feature-resolver-version-2 [5]: https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver -[workspace]: ../../cargo/reference/workspaces.html -[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-manifest -[`resolver` field]: ../../cargo/reference/resolver.html#resolver-versions -+[workspace]: ../../../cargo-doc/doc/reference/workspaces.html -+[virtual workspace]: ../../../cargo-doc/doc/reference/workspaces.html#virtual-manifest -+[`resolver` field]: ../../../cargo-doc/doc/reference/resolver.html#resolver-versions ++[workspace]: ../../../../cargo/book/reference/workspaces.html ++[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-manifest ++[`resolver` field]: ../../../../cargo/book/reference/resolver.html#resolver-versions ## Migration @@ -88,7 +88,7 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md We can further see that `bstr`'s "default" feature enables "unicode" (among other features). -[`cargo tree`]: ../../cargo/commands/cargo-tree.html -+[`cargo tree`]: ../../../cargo-doc/doc/commands/cargo-tree.html ++[`cargo tree`]: ../../../../cargo/book/commands/cargo-tree.html Index: rust/src/doc/index.md =================================================================== --- rust.orig/src/doc/index.md @@ -98,7 +98,7 @@ Index: rust/src/doc/index.md ### The Cargo 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 ++[The Cargo Book](../../cargo/book/index.html) is a guide to Cargo, Rust's build tool and dependency manager. ### The Rustdoc Book @@ -111,7 +111,7 @@ Index: rust/src/doc/reference/src/conditional-compilation.md [attribute]: attributes.md [attributes]: attributes.md -[cargo-feature]: ../cargo/reference/features.html -+[cargo-feature]: ../../cargo-doc/doc/reference/features.html ++[cargo-feature]: ../../../cargo/book/reference/features.html [crate type]: linkage.md [static C runtime]: linkage.md#static-and-dynamic-c-runtimes Index: rust/src/doc/reference/src/introduction.md @@ -124,8 +124,8 @@ Index: rust/src/doc/reference/src/introduction.md [_Expression_]: expressions.md -[cargo book]: ../cargo/index.html -[cargo reference]: ../cargo/reference/index.html -+[cargo book]: ../../cargo-doc/doc/index.html -+[cargo reference]: ../../cargo-doc/doc/reference/index.html ++[cargo book]: ../../../cargo/book/index.html ++[cargo reference]: ../../../cargo/book/reference/index.html [expressions chapter]: expressions.html [file an issue]: https://github.com/rust-lang/reference/issues [lifetime of temporaries]: expressions.html#temporaries @@ -138,7 +138,7 @@ Index: rust/src/doc/reference/src/linkage.md ``` -[cargo]: ../cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts -+[cargo]: ../../cargo-doc/doc/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts ++[cargo]: ../../../cargo/book/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts To use this feature locally, you typically will use the `RUSTFLAGS` environment variable to specify flags to the compiler through Cargo. For example to compile @@ -151,7 +151,7 @@ Index: rust/src/doc/reference/src/procedural-macros.md [Attribute macros]: #attribute-macros -[Cargo's build scripts]: ../cargo/reference/build-scripts.html -+[Cargo's build scripts]: ../../cargo-doc/doc/reference/build-scripts.html ++[Cargo's build scripts]: ../../../cargo/book/reference/build-scripts.html [Derive macros]: #derive-macros [Function-like macros]: #function-like-procedural-macros [`Delimiter::None`]: ../proc_macro/enum.Delimiter.html#variant.None @@ -164,7 +164,7 @@ Index: rust/src/doc/rustc/src/tests/index.md [`-Z panic-abort-tests`]: https://github.com/rust-lang/rust/issues/67650 [`available_parallelism`]: ../../std/thread/fn.available_parallelism.html -[`cargo test`]: ../../cargo/commands/cargo-test.html -+[`cargo test`]: ../../../cargo-doc/doc/commands/cargo-test.html ++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html [`libtest`]: ../../test/index.html [`main` function]: ../../reference/crates-and-source-files.html#main-functions [`Result`]: ../../std/result/index.html @@ -173,7 +173,7 @@ Index: rust/src/doc/rustc/src/tests/index.md [attribute-test]: ../../reference/attributes/testing.html#the-test-attribute [bench-docs]: ../../unstable-book/library-features/test.html -[Cargo]: ../../cargo/index.html -+[Cargo]: ../../../cargo-doc/doc/index.html ++[Cargo]: ../../../../cargo/book/index.html [crate type]: ../../reference/linkage.html [custom_test_frameworks documentation]: ../../unstable-book/language-features/custom-test-frameworks.html [nightly channel]: ../../book/appendix-07-nightly-rust.html @@ -186,7 +186,7 @@ Index: rust/src/doc/rustc/src/what-is-rustc.md Most Rust programmers don't invoke `rustc` directly, but instead do it through -[Cargo](../cargo/index.html). It's all in service of `rustc` though! If you -+[Cargo](../../cargo-doc/doc/index.html). It's all in service of `rustc` though! If you ++[Cargo](../../../cargo/book/index.html). It's all in service of `rustc` though! If you want to see how Cargo calls `rustc`, you can ```bash @@ -201,20 +201,20 @@ Index: rust/src/doc/edition-guide/book.toml -"/rust-2018/cargo-and-crates-io/index.html" = "../../../cargo/index.html" -"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../cargo/commands/cargo-check.html" -"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../cargo/commands/cargo-install.html" -+"/rust-2018/cargo-and-crates-io/index.html" = "../../../../cargo-doc/doc/index.html" -+"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../../cargo-doc/doc/commands/cargo-check.html" -+"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../../cargo-doc/doc/commands/cargo-install.html" ++"/rust-2018/cargo-and-crates-io/index.html" = "../../../../../cargo/book/index.html" ++"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../../../cargo/book/commands/cargo-check.html" ++"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../../../cargo/book/commands/cargo-install.html" "/rust-2018/cargo-and-crates-io/cargo-new-defaults-to-a-binary-project.html" = "https://blog.rust-lang.org/2018/03/29/Rust-1.25.html#cargo-features" -"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../cargo/commands/cargo-rustc.html" -"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../cargo/reference/workspaces.html" -"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../cargo/guide/project-layout.html" -"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../cargo/reference/overriding-dependencies.html#the-patch-section" -"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../cargo/reference/source-replacement.html" -+"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../../cargo-doc/doc/commands/cargo-rustc.html" -+"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../../cargo-doc/doc/reference/workspaces.html" -+"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../../cargo-doc/doc/guide/project-layout.html" -+"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../../cargo-doc/doc/reference/overriding-dependencies.html#the-patch-section" -+"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../../cargo-doc/doc/reference/source-replacement.html" ++"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../../../cargo/book/commands/cargo-rustc.html" ++"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../../../cargo/book/reference/workspaces.html" ++"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../../../cargo/book/guide/project-layout.html" ++"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../../../cargo/book/reference/overriding-dependencies.html#the-patch-section" ++"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../../../cargo/book/reference/source-replacement.html" "/rust-2018/cargo-and-crates-io/crates-io-disallows-wildcard-dependencies.html" = "https://blog.rust-lang.org/2016/01/21/Rust-1.6.html#cratesio-disallows-wildcards" "/rust-2018/documentation/index.html" = "../../../index.html" "/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html" @@ -223,20 +223,18 @@ Index: rust/src/doc/edition-guide/book.toml "/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable" "/rust-next/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized" -"/rust-next/cargo-vendor.html" = "../../cargo/commands/cargo-vendor.html" -+"/rust-next/cargo-vendor.html" = "../../../cargo-doc/doc/commands/cargo-vendor.html" ++"/rust-next/cargo-vendor.html" = "../../../../cargo/book/commands/cargo-vendor.html" Index: rust/src/tools/linkchecker/main.rs =================================================================== --- rust.orig/src/tools/linkchecker/main.rs +++ rust/src/tools/linkchecker/main.rs -@@ -262,6 +262,12 @@ impl Checker { +@@ -262,6 +262,10 @@ impl Checker { return; } } -+ if let Some(path_str) = path.to_str() { -+ if path_str.contains("/cargo-doc/doc/") { -+ // link to related cargo-doc, ok for our Debian build -+ return; -+ } ++ if url.contains("../../cargo/book/") { ++ // link to related cargo-doc, ok for our Debian build ++ return; + } if is_exception(file, &target_pretty_path) { report.links_ignored_exception += 1; @@ -250,7 +248,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0462.md 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 ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically fixing this issue. * Recompiling the crate as a `rlib` or `dylib`; formats suitable for Rust linking. @@ -263,7 +261,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0460.md version to depend on. -[Cargo]: ../cargo/index.html -+[Cargo]: ../../cargo-doc/doc/index.html ++[Cargo]: ../../../cargo/book/index.html Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md =================================================================== --- rust.orig/compiler/rustc_error_codes/src/error_codes/E0514.md @@ -273,7 +271,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md 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 ++ * Using [Cargo](../../../cargo/book/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. @@ -286,7 +284,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md 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. ++[build-std](../../../../cargo/book/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 @@ -296,7 +294,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md 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 ++[build-std]: ../../../../cargo/book/reference/unstable.html#build-std For example: ```cmd @@ -304,12 +302,12 @@ 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 -@@ -709,7 +709,7 @@ It is strongly recommended to combine sa +@@ -793,7 +793,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-std]: ../../../../cargo/book/reference/unstable.html#build-std # Build scripts and procedural macros @@ -322,7 +320,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0461.md 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 ++ * Using [Cargo](../../../cargo/book/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 @@ -334,7 +332,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0519.md 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 ++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically fixing this issue. * Recompiling the crate with different metadata (different name/ `crate_type`). @@ -347,7 +345,7 @@ Index: rust/src/doc/rustc/src/linker-plugin-lto.md `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) ++scripts and proc macros), see [cargo docs on rustflags](../../../cargo/book/reference/config.html#buildrustflags) If you have dependencies using the `cc` crate, you will need to set these environment variables: @@ -360,7 +358,7 @@ Index: rust/src/doc/rustc/src/platform-support/fuchsia.md [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 ++[cargo]: ../../../../cargo/book/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 @@ -373,4 +371,4 @@ Index: rust/src/doc/rustc/src/targets/custom.md ``` -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`. ++To use a custom target, see the (unstable) [`build-std` feature](../../../../cargo/book/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 156ac4e13..e4a833155 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -12,7 +12,7 @@ Index: rust/src/bootstrap/lib.rs =================================================================== --- rust.orig/src/bootstrap/lib.rs +++ rust/src/bootstrap/lib.rs -@@ -1011,10 +1011,9 @@ impl Build { +@@ -1091,10 +1091,9 @@ impl Build { match which { GitRepo::Rustc => { diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch index d7618adfe..4cd8bc1cd 100644 --- a/debian/patches/d-bootstrap-disable-git.patch +++ b/debian/patches/d-bootstrap-disable-git.patch @@ -31,7 +31,7 @@ Index: rust/src/bootstrap/dist.rs =================================================================== --- rust.orig/src/bootstrap/dist.rs +++ rust/src/bootstrap/dist.rs -@@ -995,7 +995,10 @@ impl Step for PlainSourceTarball { +@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball { } // If we're building from git sources, we need to vendor a complete distribution. @@ -41,5 +41,5 @@ Index: rust/src/bootstrap/dist.rs + // repository, but cargo-vendor should not be installed or run. + if false && builder.rust_info().is_managed_git_subrepository() { // Ensure we have the submodules checked out. + builder.update_submodule(Path::new("src/tools/cargo")); builder.update_submodule(Path::new("src/tools/rust-analyzer")); - diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch index 9747f9ede..c9d066619 100644 --- a/debian/patches/d-bootstrap-no-assume-tools.patch +++ b/debian/patches/d-bootstrap-no-assume-tools.patch @@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder/tests.rs =================================================================== --- rust.orig/src/bootstrap/builder/tests.rs +++ rust/src/bootstrap/builder/tests.rs -@@ -364,9 +364,13 @@ mod dist { +@@ -380,9 +380,13 @@ mod dist { #[test] fn dist_only_cross_host() { let b = TargetSelection::from_user("B"); diff --git a/debian/patches/d-bootstrap-read-beta-version-from-file.patch b/debian/patches/d-bootstrap-read-beta-version-from-file.patch deleted file mode 100644 index 871110cca..000000000 --- a/debian/patches/d-bootstrap-read-beta-version-from-file.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:38 +0200 -Subject: d-bootstrap-read-beta-version-from-file - -=================================================================== ---- - src/bootstrap/lib.rs | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -Index: rust/src/bootstrap/lib.rs -=================================================================== ---- rust.orig/src/bootstrap/lib.rs -+++ rust/src/bootstrap/lib.rs -@@ -1264,14 +1264,15 @@ impl Build { - return s; - } - -- // Figure out how many merge commits happened since we branched off master. -- // That's our beta number! -- // (Note that we use a `..` range, not the `...` symmetric difference.) -- let count = -- output(self.config.git().arg("rev-list").arg("--count").arg("--merges").arg(format!( -- "refs/remotes/origin/{}..HEAD", -- self.config.stage0_metadata.config.nightly_branch -- ))); -+ // Debian: read beta number from "version" file, this is only available -+ // in the rustc upstream tarballs and not their git -+ let count = output( -+ Command::new("sed") -+ .arg("-re") -+ .arg(r"s/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g") -+ .arg("version") -+ .current_dir(&self.src), -+ ); - let n = count.trim().parse().unwrap(); - self.prerelease_version.set(Some(n)); - n diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch index 017325e06..30e826d81 100644 --- a/debian/patches/d-bootstrap-rustflags.patch +++ b/debian/patches/d-bootstrap-rustflags.patch @@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder.rs =================================================================== --- rust.orig/src/bootstrap/builder.rs +++ rust/src/bootstrap/builder.rs -@@ -1377,6 +1377,18 @@ impl<'a> Builder<'a> { +@@ -1409,6 +1409,18 @@ impl<'a> Builder<'a> { } } diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch index 41531a87f..3f4b1dbe6 100644 --- a/debian/patches/d-disable-download-tests.patch +++ b/debian/patches/d-disable-download-tests.patch @@ -2,7 +2,7 @@ Index: rust/src/bootstrap/config/tests.rs =================================================================== --- rust.orig/src/bootstrap/config/tests.rs +++ rust/src/bootstrap/config/tests.rs -@@ -11,6 +11,9 @@ fn parse(config: &str) -> Config { +@@ -10,6 +10,9 @@ fn parse(config: &str) -> Config { #[test] fn download_ci_llvm() { @@ -12,7 +12,7 @@ Index: rust/src/bootstrap/config/tests.rs if crate::llvm::is_ci_llvm_modified(&parse("")) { eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change"); return; -@@ -39,7 +42,11 @@ fn download_ci_llvm() { +@@ -38,7 +41,11 @@ fn download_ci_llvm() { // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 #[test] fn detect_src_and_out() { diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index 52e152da1..99fd7e958 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -12,7 +12,7 @@ Index: rust/vendor/rustix/build.rs use cc::Build; use std::env::var; use std::io::Write; -@@ -158,16 +157,16 @@ fn link_in_librustix_outline(arch: &str, +@@ -162,16 +161,16 @@ fn link_in_librustix_outline(arch: &str, println!("cargo:rerun-if-changed={}", to); // If "cc" is not enabled, use a pre-built library. diff --git a/debian/patches/d-rustc-add-soname.patch b/debian/patches/d-rustc-add-soname.patch index 1026b26b2..03dc0ba6d 100644 --- a/debian/patches/d-rustc-add-soname.patch +++ b/debian/patches/d-rustc-add-soname.patch @@ -28,7 +28,7 @@ Index: rust/compiler/rustc_codegen_ssa/src/back/link.rs =================================================================== --- rust.orig/compiler/rustc_codegen_ssa/src/back/link.rs +++ rust/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -2216,6 +2216,13 @@ fn add_order_independent_options( +@@ -2359,6 +2359,13 @@ fn add_order_independent_options( } add_rpath_args(cmd, sess, codegen_results, out_filename); diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch index 3d2d8ff59..faee1685e 100644 --- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch +++ b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch @@ -42,7 +42,7 @@ Index: rust/src/bootstrap/bootstrap.py =================================================================== --- rust.orig/src/bootstrap/bootstrap.py +++ rust/src/bootstrap/bootstrap.py -@@ -759,6 +759,8 @@ class RustBuild(object): +@@ -877,6 +877,8 @@ class RustBuild(object): # preserve existing RUSTFLAGS env.setdefault("RUSTFLAGS", "") diff --git a/debian/patches/series b/debian/patches/series index 2f6094730..95572141b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,11 +15,11 @@ u-fix-get-toml-when-test.patch u-disable-fp-precision-test-on-i386.patch u-riscv-disable-unpacked-split-debuginfo.patch u-profiler.patch +u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch # not forwarded, or forwarded but unlikely to be merged u-ignore-ppc-hangs.patch u-rustc-llvm-cross-flags.patch -u-reproducible-dl-stage0.patch #u-allow-system-compiler-rt.patch # Debian-specific patches, not suitable for upstream @@ -44,7 +44,6 @@ d-bootstrap-rustflags.patch d-remove-arm-privacy-breaches.patch d-bootstrap-install-symlinks.patch d-bootstrap-disable-git.patch -d-bootstrap-read-beta-version-from-file.patch d-bootstrap-no-assume-tools.patch d-bootstrap-cargo-doc-paths.patch d-bootstrap-use-local-css.patch diff --git a/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch new file mode 100644 index 000000000..b49347990 --- /dev/null +++ b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch @@ -0,0 +1,40 @@ +From c230637b92a3101a5b18141b75f94ada2edee776 Mon Sep 17 00:00:00 2001 +From: Pietro Albini <pietro.albini@ferrous-systems.com> +Date: Fri, 15 Sep 2023 16:09:45 +0200 +Subject: [PATCH] avoid blessing cargo deps's source code in ui tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +FG: just the stderr part for now, the rest needs a newer cargo +Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> +--- + tests/ui/issues/issue-21763.stderr | 3 --- + 4 files changed, 20 insertions(+), 3 deletions(-) + +Index: rust/tests/ui/issues/issue-21763.stderr +=================================================================== +--- rust.orig/tests/ui/issues/issue-21763.stderr ++++ rust/tests/ui/issues/issue-21763.stderr +@@ -9,9 +9,6 @@ LL | foo::<HashMap<Rc<()>, Rc<()>>>( + = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` + note: required because it appears within the type `HashMap<Rc<()>, Rc<()>, RandomState>` + --> $HASHBROWN_SRC_LOCATION +- | +-LL | pub struct HashMap<K, V, S = DefaultHashBuilder, A: Allocator + Clone = Global> { +- | ^^^^^^^ + note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` + --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL + note: required by a bound in `foo` +Index: rust/tests/ui/issues/issue-21763.rs +=================================================================== +--- rust.orig/tests/ui/issues/issue-21763.rs ++++ rust/tests/ui/issues/issue-21763.rs +@@ -1,6 +1,6 @@ + // Regression test for HashMap only impl'ing Send/Sync if its contents do + +-// normalize-stderr-test: "\S+hashbrown-\S+" -> "$$HASHBROWN_SRC_LOCATION" ++// normalize-stderr-test: "\S+[\\/]hashbrown\S+" -> "$$HASHBROWN_SRC_LOCATION" + + use std::collections::HashMap; + use std::rc::Rc; diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch index 34789ecae..4b5bcb6d5 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/u-fix-get-toml-when-test.patch @@ -10,32 +10,27 @@ Index: rust/src/bootstrap/config.rs =================================================================== --- rust.orig/src/bootstrap/config.rs +++ rust/src/bootstrap/config.rs -@@ -848,9 +848,9 @@ impl Config { - } +@@ -931,9 +931,32 @@ impl Config { pub fn parse(args: &[String]) -> Config { -- #[cfg(test)] -+ /*#[cfg(test)] - 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())); -@@ -859,7 +859,23 @@ impl Config { - 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. -+ Ok(table) => if !cfg!(test) || table.build.is_none() { -+ table -+ } else { + #[cfg(test)] +- fn get_toml(_: &Path) -> TomlConfig { +- TomlConfig::default() +- } ++ fn get_toml(file: &Path) -> TomlConfig { ++ // 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. ++ let contents = ++ t!(fs::read_to_string(file), format!("config file {} not found", file.display())); ++ // Deserialize to Value and then TomlConfig to prevent the Deserialize impl of ++ // TomlConfig and sub types to be monomorphized 5x by toml. ++ toml::from_str(&contents) ++ .and_then(|table: toml::Value| TomlConfig::deserialize(table)) ++ .map(|table| { + let mut config = TomlConfig::default(); + let mut build = Build::default(); + let cbuild = table.build.unwrap(); @@ -43,7 +38,11 @@ Index: rust/src/bootstrap/config.rs + build.cargo = cbuild.cargo; + config.build = Some(build); + config -+ }, - Err(err) => { - eprintln!("failed to parse TOML configuration '{}': {}", file.display(), err); - crate::detail_exit(2); ++ }) ++ .unwrap_or_else(|err| { ++ eprintln!("failed to parse TOML configuration '{}': {err}", file.display()); ++ crate::detail_exit(2); ++ }) } + + #[cfg(not(test))] + fn get_toml(file: &Path) -> TomlConfig { diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch index 37f63af69..f83e4fcbc 100644 --- a/debian/patches/u-profiler.patch +++ b/debian/patches/u-profiler.patch @@ -46,7 +46,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -314,6 +314,10 @@ pub fn std_cargo(builder: &Builder<'_>, +@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, cargo.env("MACOSX_DEPLOYMENT_TARGET", target); } @@ -59,16 +59,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. // `compiler-rt` repository, but our `src/llvm-project` submodule isn't --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -454,7 +454,7 @@ pub struct Target { +@@ -467,7 +467,7 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub sanitizers: Option<bool>, - pub profiler: Option<bool>, + pub profiler: Option<StringOrBool>, + pub rpath: Option<bool>, pub crt_static: Option<bool>, pub musl_root: Option<PathBuf>, - pub musl_libdir: Option<PathBuf>, -@@ -715,9 +715,9 @@ define_config! { +@@ -796,9 +796,9 @@ define_config! { } } @@ -80,7 +80,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. String(String), Bool(bool), } -@@ -728,6 +728,12 @@ impl Default for StringOrBool { +@@ -809,6 +809,12 @@ impl Default for StringOrBool { } } @@ -93,16 +93,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. define_config! { /// TOML representation of how the Rust build is configured. struct Rust { -@@ -799,7 +805,7 @@ define_config! { +@@ -880,7 +886,7 @@ define_config! { llvm_libunwind: Option<String> = "llvm-libunwind", android_ndk: Option<String> = "android-ndk", sanitizers: Option<bool> = "sanitizers", - profiler: Option<bool> = "profiler", + profiler: Option<StringOrBool> = "profiler", + rpath: Option<bool> = "rpath", crt_static: Option<bool> = "crt-static", musl_root: Option<String> = "musl-root", - musl_libdir: Option<String> = "musl-libdir", -@@ -1616,12 +1622,24 @@ impl Config { +@@ -1744,12 +1750,24 @@ impl Config { self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers } @@ -128,4 +128,4 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. + || self.profiler } - pub fn llvm_enabled(&self) -> bool { + pub fn rpath_enabled(&self, target: TargetSelection) -> bool { diff --git a/debian/patches/u-reproducible-dl-stage0.patch b/debian/patches/u-reproducible-dl-stage0.patch deleted file mode 100644 index 1d0527d2c..000000000 --- a/debian/patches/u-reproducible-dl-stage0.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:37 +0200 -Subject: u-reproducible-dl-stage0 - -=================================================================== ---- - src/bootstrap/bootstrap.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rust/src/bootstrap/bootstrap.py -=================================================================== ---- rust.orig/src/bootstrap/bootstrap.py -+++ rust/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", 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/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch index d947a6950..faa70d7fa 100644 --- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch +++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch @@ -2,7 +2,7 @@ Index: rust/compiler/rustc_lint_defs/src/builtin.rs =================================================================== --- rust.orig/compiler/rustc_lint_defs/src/builtin.rs +++ rust/compiler/rustc_lint_defs/src/builtin.rs -@@ -2880,11 +2880,13 @@ declare_lint! { +@@ -2883,11 +2883,13 @@ declare_lint! { /// /// use std::arch::asm; /// @@ -20,7 +20,7 @@ Index: rust/compiler/rustc_lint/src/builtin.rs =================================================================== --- rust.orig/compiler/rustc_lint/src/builtin.rs +++ rust/compiler/rustc_lint/src/builtin.rs -@@ -3110,7 +3110,10 @@ declare_lint! { +@@ -3102,7 +3102,10 @@ declare_lint! { /// ### Example /// /// ```rust,compile_fail diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps index 5807b4a4c..ae733854f 100755 --- a/debian/prune-unused-deps +++ b/debian/prune-unused-deps @@ -17,6 +17,7 @@ done test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig test -f src/bootstrap/Cargo.lock.orig || cp src/bootstrap/Cargo.lock src/bootstrap/Cargo.lock.orig test -f src/tools/rust-analyzer/Cargo.lock.orig || cp src/tools/rust-analyzer/Cargo.lock src/tools/rust-analyzer/Cargo.lock.orig +test -f src/tools/cargo/Cargo.lock.orig || cp src/tools/cargo/Cargo.lock src/tools/cargo/Cargo.lock.orig rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock find vendor -name .cargo-checksum.json -execdir "$scriptdir/debian/prune-checksums" "{}" + @@ -30,10 +31,14 @@ cargo update --offline # re-generate src/tools/rust-analyzer/Cargo.lock after patching ( cd src/tools/rust-analyzer && cargo update --offline ) +# re-generate src/tools/cargo/Cargo.lock after patching +( cd src/tools/cargo && cargo update --offline ) + needed_crates() { cat Cargo.lock \ src/bootstrap/Cargo.lock \ src/tools/rust-analyzer/Cargo.lock \ + src/tools/cargo/Cargo.lock \ | sed -z -e 's/\nname = /name = /g' -e 's/\nversion = /version = /g' \ | sed -ne 's/\[\[package\]\]name = "\(.*\)"version = "\(.*\)"/\1 \2/gp' } diff --git a/debian/rules b/debian/rules index 0d8f0825b..c7b05413c 100755 --- a/debian/rules +++ b/debian/rules @@ -317,9 +317,12 @@ endif TEST_LOG = debian/rustc-tests.log # This is advertised as "5 tests failed" in README.Debian because our counting # method is imprecise and in practise we count some failures twice. -FAILURES_ALLOWED = 8 +# temporarily bumped from 8 to 10 to account for test output changes depending +# on build path length, bump down again once 1.78 is imported +FAILURES_ALLOWED = 10 ifneq (,$(filter $(DEB_BUILD_ARCH), armhf)) - FAILURES_ALLOWED = 12 +# temporarily bumped from 12 to 15, see above + FAILURES_ALLOWED = 15 endif ifneq (,$(filter $(DEB_BUILD_ARCH), armel mips mips64el)) FAILURES_ALLOWED = 24 diff --git a/debian/rustc.links b/debian/rust-llvm.links index d77996a8e..7090a480d 100644 --- a/debian/rustc.links +++ b/debian/rust-llvm.links @@ -4,3 +4,6 @@ usr/bin/llvm-dwp-16 usr/bin/rust-llvm-dwp # for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64 +# For applications that use cargo-binutils, e.g. grcov +usr/bin/llvm-profdata-16 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata +usr/bin/llvm-cov-16 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov diff --git a/debian/rust-src.install b/debian/rust-src.install index ea9961ce1..4f0a02cce 100644 --- a/debian/rust-src.install +++ b/debian/rust-src.install @@ -13,3 +13,4 @@ Cargo.toml usr/src/rustc-${env:RUST_LONG_VERSION} src usr/src/rustc-${env:RUST_LONG_VERSION} library usr/src/rustc-${env:RUST_LONG_VERSION} compiler usr/src/rustc-${env:RUST_LONG_VERSION} +Cargo.lock usr/src/rustc-${env:RUST_LONG_VERSION} diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 0719f25df..02e7eb046 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -15,5 +15,8 @@ rustc source: mismatched-override missing-license-paragraph-in-dep5-copyright de rustc source: missing-license-paragraph-in-dep5-copyright mpl-2.0+ [debian/copyright:*] rustc source: missing-license-paragraph-in-dep5-copyright debian/copyright mpl-2.0+ (*) +# see d/copyright +rustc source: source-contains-prebuilt-windows-binary [vendor/windows-metadata/default/*.winmd] + # lintian is superfluous rustc source: superfluous-file-pattern debian/copyright * (*) diff --git a/debian/update-version.sh b/debian/update-version.sh index c2b1688de..491e1bbb0 100755 --- a/debian/update-version.sh +++ b/debian/update-version.sh @@ -6,15 +6,8 @@ local V=$1 python3 -c 'import sys; k=list(map(int,sys.argv[1].split("."))); k[1]-=1; print(".".join(map(str,k)))' "$V" } -cargo_new() { -local V=$1 -python3 -c 'import sys; k=list(map(int,sys.argv[1].split("."))); k[1]+='"${2:-1}"'; k[0]-=1; print(".".join(map(str,k)))' "$V" -} - update() { local ORIG=$1 NEW=$2 NEW_LONG=$3 -local CARGO_NEW=${4:-$(cargo_new $NEW)} -local CARGO_NEXT=${4:-$(cargo_new $NEW 2)} ORIG_M1=$(prev_stable $ORIG) NEW_M1=$(prev_stable $NEW) @@ -38,8 +31,7 @@ fi sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \ -e "s|rustc:native\( *\)(<= [^)]*)|rustc:native\1(<= $NEW_LONG++)|g" \ -e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc:native\1(>= ${NEW_M1}|g" \ - -e "s|cargo\( *\)(>= [^)]*)|cargo\1(>= ${CARGO_NEW}.0~~)|g" \ - -e "s|cargo\( *\)(<< [^)]*)|cargo\1(<< ${CARGO_NEXT}.0~~)|g" \ + -e "s|cargo:native\( *\)(>= ${ORIG_M1/./\\.}|cargo:native\1(>= ${NEW_M1}|g" \ control if [ "$WASI_COMMIT" != "$WASI_COMMIT_OLD" ]; then diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index 59114a985..0d3d51bcb 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -57,12 +57,12 @@ 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-sony-vita-eabihf.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md src/doc/rustc/src/targets/known-issues.md src/doc/rustdoc/src/*.md src/doc/unstable-book/src/*/*.md +src/etc/completions/x.py.sh src/etc/third-party/README.txt src/librustdoc/html/highlight/fixtures/sample.html src/librustdoc/html/static/scrape-examples-help.md @@ -85,29 +85,38 @@ vendor/*/*/*/LICENSE vendor/*/*/LICENSE vendor/*/CHANGELOG.md vendor/*/CODE_OF_CONDUCT.md +vendor/*/CONTRIBUTORS.md +vendor/*/COPYRIGHT vendor/*/Cargo.toml +vendor/*/FAQ.md vendor/*/LICENSE vendor/*/LICENSE-MIT vendor/*/README.md -vendor/ahash-0.7.6/FAQ.md -vendor/ahash/FAQ.md +vendor/*/Readme.md +vendor/*/SPONSORS.md +vendor/*/readme.md vendor/ammonia/src/lib.rs vendor/anstyle-parse/src/state/table.rs vendor/base64ct/tests/proptests.proptest-regressions +vendor/chrono/src/offset/local/tz_info/rule.rs +vendor/chrono/src/offset/local/tz_info/timezone.rs vendor/clap-*/examples/demo.md vendor/clap-*/examples/tutorial_*/*.md vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xmd.rs vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xof.rs vendor/elliptic-curve/src/jwk.rs -vendor/generic-array/DESIGN.md +vendor/fiat-crypto/src/secp256k1_dettman_64.rs vendor/git2/src/cred.rs +vendor/half/LICENSES/Apache-2.0.txt +vendor/half/LICENSES/MIT.txt vendor/handlebars/src/lib.rs vendor/handlebars/src/render.rs vendor/handlebars/src/template.rs +vendor/kstring/benches/clone.rs vendor/lazy_static/src/lib.rs vendor/maplit/README.rst vendor/mdbook/CONTRIBUTING.md -vendor/miniz_oxide*/Readme.md +vendor/p384/src/arithmetic/hash2curve.rs vendor/pasetors/src/token.rs vendor/pulldown-cmark/tests/suite/footnotes.rs vendor/rustc-demangle/src/legacy.rs @@ -123,7 +132,10 @@ 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/vcpkg/notes.md +vendor/web-sys/src/features/gen_SvgTextElement.rs +vendor/web-sys/src/features/gen_SvgtSpanElement.rs +vendor/winnow/benches/contains_token.rs vendor/zerovec/src/map2d/map.rs # False-positive, audit-vendor-source automatically flags JS/C files @@ -143,9 +155,13 @@ src/tools/rustdoc-gui/.eslintrc.js src/tools/rustdoc-gui/tester.js src/tools/rustdoc-js/.eslintrc.js src/tools/rustdoc-js/tester.js +vendor/cxx/book/build.js +vendor/cxx/book/package-lock.json +vendor/cxx/book/package.json vendor/libz-sys/src/smoke.c vendor/openssl-sys/build/expando.c vendor/signal-hook/src/low_level/extract.c +vendor/wasm-bindgen-macro/src/worker.js vendor/wasm-bindgen/_package.json vendor/wasm-bindgen/examples/import_js/package.json @@ -167,7 +183,9 @@ src/doc/rustc-dev-guide/src/queries/example-0.counts.txt src/etc/rust_analyzer_settings.json src/stage0.json src/tools/clippy/.remarkrc +*/*/.github/actions/github-release/* vendor/elasticlunr-rs/src/lang/*.rs +vendor/plotters/src/style/colors/full_palette.rs # False-positive, hand-editable small image src/doc/book/2018-edition/src/img/*.png @@ -189,6 +207,8 @@ 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/doc/rustdoc/src/images/collapsed-long-item.png +src/doc/rustdoc/src/images/collapsed-trait-impls.png src/librustdoc/html/static/images/favicon-*.png src/tools/cargo/src/doc/src/images/Cargo-Logo-Small.png src/tools/cargo/src/doc/src/images/auth-level-acl.png @@ -199,6 +219,8 @@ src/tools/cargo/src/doc/src/images/org-level-acl.png src/tools/cargo/src/doc/src/images/winapi-features.svg src/tools/cargo/src/doc/theme/favicon.png src/tools/rust-analyzer/assets/logo-*.svg +vendor/cxx/book/src/cxx.png +vendor/cxx/book/src/overview.svg vendor/imara-diff/plots/*.svg vendor/mdbook/src/theme/favicon.png vendor/mdbook/src/theme/favicon.svg @@ -222,8 +244,7 @@ library/stdarch/crates/stdarch-verify/x86-intel.xml src/tools/*/tests/*/*.stderr src/tools/cargo/benches/workspaces/*.tgz src/tools/cargo/crates/mdman/tests/compare/expected/formatting.txt -src/tools/cargo/tests/testsuite/build_script.rs -src/tools/cargo/tests/testsuite/ssh.rs +src/tools/cargo/tests/testsuite/*.rs src/tools/clippy/tests/ui-internal/auxiliary/paths.rs src/tools/clippy/tests/ui-toml/*/*.stderr src/tools/clippy/tests/ui-toml/large_include_file/too_big.txt @@ -251,6 +272,8 @@ tests/*/*/*/*.rs tests/auxiliary/rust_test_helpers.c tests/debuginfo/type-names.cdb.js tests/run-make/*/*.c +tests/run-make/libtest-junit/output-default.xml +tests/run-make/libtest-junit/output-stdout-success.xml 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 @@ -261,14 +284,18 @@ tests/ui/macros/not-utf8.bin tests/ui/nll/*/*.stderr tests/ui/parser/issues/*.stderr tests/ui/proc-macro/debug/*.stderr +tests/ui/rfcs/rfc-3348-c-string-literals/no-nuls.stderr vendor/annotate-snippets/tests/fixtures/no-color/strip_line_non_ws.toml vendor/basic-toml/tests/invalid-encoder/array-mixed-types-ints-and-floats.json vendor/basic-toml/tests/valid/*.json vendor/basic-toml/tests/valid/table-whitespace.toml -vendor/bstr-0.2.17/src/unicode/fsm/*.dfa vendor/bstr/src/unicode/fsm/*.dfa vendor/cargo_metadata*/tests/test_samples.rs +vendor/codespan-reporting/tests/snapshots/term__position_indicator__rich_ascii_no_color.snap +vendor/codespan-reporting/tests/snapshots/term__position_indicator__rich_no_color.snap vendor/content_inspector/testdata/* +vendor/csv/examples/data/*.csv +vendor/csv/examples/data/bench/*.csv vendor/der/tests/examples/spki.der vendor/diff/tests/data/gitignores.chars.diff vendor/dissimilar/benches/*.txt @@ -276,7 +303,6 @@ vendor/elasticlunr-rs/tests/data/*.in.txt vendor/elasticlunr-rs/tests/searchindex_fixture_*.json vendor/elliptic-curve/tests/examples/*.der vendor/elliptic-curve/tests/examples/*.pem -vendor/flate2-1.0.23/tests/* vendor/flate2/tests/*.gz vendor/flate2/tests/corrupt-gz-file.bin vendor/fluent-syntax/benches/parser.rs @@ -295,6 +321,7 @@ vendor/idna/tests/IdnaTest*.txt vendor/idna/tests/punycode_tests.json vendor/im-rc/proptest-regressions/*.txt vendor/im-rc/proptest-regressions/*/*.txt +vendor/im-rc/proptest-regressions/ord/map vendor/js-sys/tests/headless.js vendor/js-sys/tests/wasm/*.js vendor/js-sys/tests/wasm/global_fns.rs @@ -321,6 +348,8 @@ vendor/petgraph/tests/res/*.txt vendor/pkcs8/tests/examples/*.der vendor/pkcs8/tests/examples/*.pem vendor/pkcs8/tests/private_key.rs +vendor/proptest/proptest-regressions/test_runner/rng.txt +vendor/proptest/src/regex-contrib/crates_regex.rs 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 @@ -331,6 +360,9 @@ vendor/rustc-demangle/src/lib.rs vendor/rustc-demangle/src/v0-large-test-symbols/early-recursion-limit vendor/sec1/tests/examples/p256-priv.der vendor/sec1/tests/examples/p256-priv.pem +vendor/serde_cbor/examples/tux.cbor +vendor/serde_cbor/tests/crash.cbor +vendor/serde_cbor/tests/kietaub.cbor vendor/serde_json/tests/lexical/parse.rs vendor/sha1/tests/data/sha1.blb vendor/sha2/tests/data/*.blb @@ -340,10 +372,14 @@ vendor/toml_edit/tests/fixtures/invalid/*/*.stderr vendor/unicode-ident/tests/fst/*.fst vendor/unicode-segmentation/src/testdata.rs vendor/url/tests/*.json +vendor/varisat/proptest-regressions/solver.txt +vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/* +vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status vendor/vte/tests/demo.vte vendor/walkdir/compare/nftw.c vendor/wasm-bindgen/tests/headless/* vendor/wasm-bindgen/tests/wasm/* +vendor/web-sys/tests/wasm/*.js vendor/zerovec/benches/testdata/*.postcard vendor/zip/tests/data/*.zip @@ -356,22 +392,27 @@ src/tools/rust-analyzer/crates/parser/src/syntax_kind/generated.rs vendor/linux-raw-sys/src/x86_64/general.rs vendor/pest_meta/src/grammar.rs vendor/regex-syntax/src/unicode_tables/*.rs +vendor/regex-syntax-0.*/src/unicode_tables/*.rs vendor/ucd-parse/src/sentence_break.rs vendor/ucd-trie/src/general_category.rs vendor/unicode-normalization/src/tables.rs vendor/unicode-script/src/tables.rs vendor/unicode-segmentation/src/tables.rs vendor/wasi/src/lib_generated.rs +vendor/windows-metadata/default/*.winmd +compiler/rustc_baked_icu_data/src/data/list/and_v1/es.rs.data +compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data +compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data # Compromise, ideally we'd package these in their own package src/librustdoc/html/static/fonts/*.woff2 -# file brokenness +# 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 -extra/bitflags/src/traits.rs +compiler/rustc_trait_selection/src/solve/search_graph/mod.rs library/alloc/src/slice/tests.rs library/std/src/sys/unix/process/process_unix.rs library/stdarch/crates/stdarch-verify/src/lib.rs @@ -388,8 +429,8 @@ 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-0.7.4/src/hash_quality_test.rs +vendor/ahash-0.7.4/src/lib.rs vendor/ahash/src/fallback_hash.rs vendor/ahash/src/hash_quality_test.rs vendor/ahash/src/lib.rs @@ -403,12 +444,18 @@ vendor/base64/src/encode.rs vendor/base64ct/src/*.rs vendor/base64ct/tests/*.rs vendor/block-buffer/tests/mod.rs +vendor/camino/src/serde_impls.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/csv-core/src/reader.rs +vendor/csv-core/src/writer.rs +vendor/cxx-build/src/gen/file.rs +vendor/cxx-build/src/syntax/qualified.rs +vendor/cxxbridge-macro/src/syntax/qualified.rs vendor/datafrog/src/lib.rs vendor/derive_more/src/*.rs vendor/digest/src/core_api/rt_variable.rs @@ -419,8 +466,6 @@ vendor/ecdsa/src/der.rs vendor/ed25519-compact/src/sha512.rs vendor/env_logger-0.*/src/fmt/writer/mod.rs vendor/env_logger/src/fmt/writer/mod.rs -vendor/flate2-1.0.23/src/mem.rs -vendor/flate2-1.0.23/src/zio.rs vendor/flate2/src/mem.rs vendor/flate2/src/zio.rs vendor/futures-macro/src/lib.rs @@ -439,6 +484,7 @@ vendor/gix-features/src/parallel/reduce.rs vendor/gix-features/src/zlib/mod.rs vendor/gix-features/src/zlib/stream/inflate.rs vendor/gix-odb/src/store_impls/loose/find.rs +vendor/gix-path/src/env/git.rs vendor/gix-protocol/src/fetch/delegate.rs vendor/gix-ref/src/store/packed/decode.rs vendor/gix-ref/src/store/packed/decode/tests.rs @@ -446,6 +492,7 @@ vendor/gix-revision/src/spec/parse/function.rs vendor/icu_locid/tests/langid.rs vendor/icu_locid/tests/locale.rs vendor/indoc/src/lib.rs +vendor/libm-0.1.4/src/math/atan.rs vendor/libm/src/math/atan.rs vendor/miniz_oxide*/src/deflate/mod.rs vendor/miniz_oxide*/src/inflate/mod.rs @@ -472,30 +519,6 @@ vendor/nom/tests/issues.rs vendor/nom/tests/json.rs vendor/nom/tests/mp4.rs vendor/nom/tests/multiline.rs -vendor/nom8/src/bits/complete.rs -vendor/nom8/src/bits/mod.rs -vendor/nom8/src/bits/streaming.rs -vendor/nom8/src/bits/tests.rs -vendor/nom8/src/branch/mod.rs -vendor/nom8/src/branch/tests.rs -vendor/nom8/src/bytes/complete.rs -vendor/nom8/src/bytes/mod.rs -vendor/nom8/src/bytes/streaming.rs -vendor/nom8/src/character/complete.rs -vendor/nom8/src/character/streaming.rs -vendor/nom8/src/combinator/mod.rs -vendor/nom8/src/combinator/tests.rs -vendor/nom8/src/error.rs -vendor/nom8/src/multi/mod.rs -vendor/nom8/src/multi/tests.rs -vendor/nom8/src/number/complete.rs -vendor/nom8/src/parser.rs -vendor/nom8/src/sequence/mod.rs -vendor/nom8/tests/css.rs -vendor/nom8/tests/issues.rs -vendor/nom8/tests/json.rs -vendor/nom8/tests/mp4.rs -vendor/nom8/tests/multiline.rs vendor/openssl/src/envelope.rs vendor/orion/src/test_framework/aead_interface.rs vendor/orion/src/test_framework/streamcipher_interface.rs @@ -505,6 +528,7 @@ vendor/pest/src/position.rs vendor/pest/src/span.rs vendor/pest/tests/calculator.rs vendor/pest_generator/src/generator.rs +vendor/pest_generator/src/lib.rs vendor/proc-macro2/src/parse.rs vendor/pulldown-cmark/benches/html_rendering.rs vendor/pulldown-cmark/src/linklabel.rs @@ -515,6 +539,7 @@ vendor/rustc-rayon/tests/sort-panic-safe.rs vendor/rustversion/src/attr.rs vendor/rustversion/src/lib.rs vendor/semver/src/parse.rs +vendor/serde_cbor/tests/de.rs vendor/sha2/src/sha256.rs vendor/sha2/src/sha512.rs vendor/shlex/src/lib.rs @@ -538,19 +563,47 @@ vendor/thiserror-impl/src/attr.rs vendor/time/src/parsing/*.rs vendor/time/src/parsing/combinator/mod.rs vendor/time/src/parsing/combinator/rfc/*.rs +vendor/time/src/primitive_date_time.rs vendor/toml_edit/src/parser/key.rs vendor/toml_edit/src/parser/mod.rs vendor/toml_edit/src/parser/numbers.rs vendor/toml_edit/src/parser/strings.rs vendor/toml_edit/src/raw_string.rs +vendor/toml_edit/tests/testsuite/parse.rs vendor/url/src/parser.rs vendor/utf-8/benches/from_utf8_lossy.rs vendor/utf-8/tests/unit.rs +vendor/varisat-checker/src/lib.rs +vendor/varisat-dimacs/src/lib.rs +vendor/varisat/src/clause/alloc.rs +vendor/varisat/src/solver.rs +vendor/vec_mut_scan/src/lib.rs +vendor/windows-bindgen/src/constants.rs +vendor/winnow/examples/css/parser.rs +vendor/winnow/examples/http/parser.rs +vendor/winnow/examples/http/parser_streaming.rs +vendor/winnow/examples/json/parser.rs +vendor/winnow/examples/json/parser_dispatch.rs +vendor/winnow/examples/json/parser_partial.rs +vendor/winnow/examples/ndjson/example.ndjson +vendor/winnow/examples/ndjson/parser.rs +vendor/winnow/src/bits/mod.rs +vendor/winnow/src/bits/tests.rs +vendor/winnow/src/branch/mod.rs +vendor/winnow/src/branch/tests.rs +vendor/winnow/src/bytes/mod.rs +vendor/winnow/src/character/mod.rs +vendor/winnow/src/combinator/mod.rs +vendor/winnow/src/combinator/tests.rs +vendor/winnow/src/error.rs +vendor/winnow/src/multi/tests.rs +vendor/winnow/src/number/mod.rs +vendor/winnow/src/sequence/mod.rs vendor/xz2/src/bufread.rs vendor/xz2/src/stream.rs vendor/yansi/src/tests.rs -# file brokenness +# file brokenness (detected als Dyalog APL transfer) vendor/clap/examples/demo.md vendor/clap/examples/tutorial_builder/*.md vendor/clap/examples/tutorial_derive/*.md |