diff options
31 files changed, 899 insertions, 760 deletions
diff --git a/debian/bin/rust-lld b/debian/bin/rust-lld index b3880d793..9d5fdd03d 100755 --- a/debian/bin/rust-lld +++ b/debian/bin/rust-lld @@ -6,4 +6,4 @@ # However the tests fail for other reasons, namely we can't build rustdoc # (which runs the tests) in wasm32 yet. So this is just WIP at the moment, # it is not expect to work nor to be installed on user machines. -exec /usr/bin/lld-16 "${@/#-Wl,/}" +exec /usr/bin/lld-17 "${@/#-Wl,/}" diff --git a/debian/cargo.install b/debian/cargo.install index ba8bde3f5..4895cfba0 100644 --- a/debian/cargo.install +++ b/debian/cargo.install @@ -1,5 +1,4 @@ usr/bin/cargo -usr/libexec/cargo-credential-1password usr/libexec debian/scripts/* usr/share/cargo/scripts debian/bin/cargo usr/share/cargo/bin usr/share/zsh/site-functions/_cargo usr/share/zsh/vendor-completions diff --git a/debian/changelog b/debian/changelog index 23b96c551..9da63069b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +rustc (1.73.0+dfsg1-1) unstable; urgency=medium + + * libstd-rust-1.73: fix ldconfig trigger + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Tue, 28 May 2024 17:06:58 +0200 + +rustc (1.73.0+dfsg1-1~exp1) experimental; urgency=medium + + * new upstream release + * switch to LLVM 17 + * update wasi-libc to ~git20230821.ec4566b + * cargo: remove cargo-credential-1password helper binary + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Mon, 27 May 2024 22:20:44 +0200 + rustc (1.72.1+dfsg1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 9c6f46643..b7bbc418e 100644 --- a/debian/control +++ b/debian/control @@ -16,15 +16,15 @@ Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.17.14), python3:native, - cargo:native (>= 1.71.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (>= 1.71.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (<= 1.72.1++) <!pkg.rustc.dlstage0>, - llvm-16-dev:native, - llvm-16-tools:native, + cargo:native (>= 1.72.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (>= 1.72.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (<= 1.73.0++) <!pkg.rustc.dlstage0>, + llvm-17-dev:native, + llvm-17-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>, gcc-mingw-w64-i686-posix:native [i386] <!nowindows>, - libllvm16 (>= 1:16.0.0), - libclang-rt-16-dev:native, + libllvm17t64 (>= 1:17.0.0), + libclang-rt-17-dev:native, cmake (>= 3.0), # needed by some vendor crates pkgconf, @@ -52,9 +52,9 @@ Build-Depends: curl <pkg.rustc.dlstage0>, ca-certificates <pkg.rustc.dlstage0>, Build-Depends-Indep: - wasi-libc (>= 0.0~git20230621.7018e24~~) <!nowasm>, - wasi-libc (<= 0.0~git20230621.7018e24++) <!nowasm>, - clang-16:native, + wasi-libc (>= 0.0~git20230821.ec4566b~~) <!nowasm>, + wasi-libc (<= 0.0~git20230821.ec4566b++) <!nowasm>, + clang-17:native, Build-Conflicts: gdb-minimal <!nocheck> Standards-Version: 4.6.2 Homepage: http://www.rust-lang.org/ @@ -89,7 +89,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.72 +Package: libstd-rust-1.73 Section: libs Architecture: any Multi-Arch: same @@ -116,7 +116,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libstd-rust-1.72 (= ${binary:Version}), + libstd-rust-1.73 (= ${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 @@ -168,7 +168,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} # Embeds wasi-libc so doesn't need to depend on it # None of its licenses require source redistrib, so no need for Built-Using Recommends: - lld-16, clang-16, + lld-17, clang-17, Suggests: # nodejs contains wasi-node for running the program nodejs (>= 12.16), @@ -214,7 +214,7 @@ Description: Rust debugger (gdb) Package: rust-lldb Architecture: all # When updating, also update rust-lldb.links -Depends: lldb-16, ${misc:Depends}, python3-lldb-16 +Depends: lldb-17, ${misc:Depends}, python3-lldb-17 Replaces: rustc (<< 1.1.0+dfsg1-1) Description: Rust debugger (lldb) Rust is a curly-brace, block-structured expression language. It @@ -245,9 +245,9 @@ Replaces: Depends: ${misc:Depends}, # lld and clang are needed for wasm compilation - lld-16, clang-16, + lld-17, clang-17, # llvm is needed for llvm-dwp for split-debuginfo=packed - llvm-16 + llvm-17 Description: Rust LLVM integration Rust is a curly-brace, block-structured expression language. It visually resembles the C language family, but differs significantly @@ -311,7 +311,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.72 (= ${binary:Version}) + libstd-rust-1.73 (= ${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 182c25738..a2b1a2596 100644 --- a/debian/copyright +++ b/debian/copyright @@ -42,8 +42,10 @@ Files-Excluded: vendor/jsonpath_lib/docs vendor/mdbook/src/theme/playground_editor vendor/psm/src/arch/wasm32.o - vendor/rustix/src/backend/linux_raw/arch/outline/*/*.a vendor/rustix-*/src/backend/linux_raw/arch/outline/*/*.a +# test binary files + vendor/libloading-0.7.4/tests/*.dll + vendor/libloading/tests/*.dll # Misc vendor/*/icon_CLion.svg vendor/wasm-bindgen/guide @@ -57,12 +59,11 @@ Files-Excluded: vendor/anstyle-parse-0.2.0 vendor/anstyle-wincon vendor/anyhow-1.0.66 - vendor/anyhow-1.0.70 + vendor/anyhow-1.0.71 + vendor/anyhow-1.0.72 vendor/anymap vendor/arbitrary - vendor/arrayvec-0.7.2 vendor/backtrace-0.3.67 - vendor/bitflags-2.1.0 vendor/bitflags-2.3.2 vendor/block-buffer-0.10.2 vendor/bstr-0.2.17 @@ -73,14 +74,11 @@ Files-Excluded: vendor/chalk-recursive vendor/chalk-solve vendor/clap-4.2.4 - vendor/clap-4.3.3 vendor/clap_builder-4.2.4 - vendor/clap_builder-4.3.3 vendor/clap_complete-4.2.2 vendor/clap_derive-4.2.0 vendor/clap_lex-0.4.1 vendor/command-group - vendor/core-foundation vendor/core-foundation-sys-0.8.3 vendor/cpufeatures-0.2.5 vendor/cpufeatures-0.2.7 @@ -99,13 +97,11 @@ Files-Excluded: vendor/crossbeam-channel-0.5.6 vendor/crossbeam-deque-0.8.2 vendor/crossbeam-epoch-0.9.13 - vendor/crossbeam-epoch-0.9.14 vendor/crossbeam-utils-0.8.14 - vendor/crossbeam-utils-0.8.15 vendor/crypto-common-0.1.3 - vendor/ctor-0.1.22 vendor/ctor vendor/ctrlc + vendor/curl-sys-0.4.63+curl-8.1.2 vendor/derive_arbitrary vendor/diff-0.1.12 vendor/digest-0.10.3 @@ -113,24 +109,24 @@ Files-Excluded: vendor/dot vendor/either-1.6.1 vendor/env_logger-0.9.3 + vendor/equivalent-1.0.0 vendor/errno-0.3.0 + vendor/fallible-iterator-0.2.0 vendor/filetime-0.2.16 vendor/filetime-0.2.19 vendor/fixedbitset - vendor/flate2-1.0.25 - vendor/form_urlencoded-1.1.0 vendor/fsevent-sys vendor/fst vendor/fwdansi vendor/generic-array-0.14.5 vendor/gimli-0.27.2 vendor/globset-0.4.8 + vendor/hashbrown-0.13.2 vendor/heck-0.3.3 vendor/hermit-abi-0.2.6 + vendor/hermit-abi-0.3.1 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index - vendor/home-0.5.4 - vendor/idna-0.3.0 vendor/ignore-0.4.18 vendor/inotify vendor/inotify-sys @@ -143,7 +139,6 @@ Files-Excluded: vendor/kqueue-sys vendor/libc-0.2.138 vendor/libc-0.2.140 - vendor/libc-0.2.141 vendor/libc-0.2.146 vendor/libffi vendor/libffi-sys @@ -151,30 +146,32 @@ Files-Excluded: vendor/libnghttp2-sys vendor/linked-hash-map vendor/linux-raw-sys-0.3.2 - vendor/lock_api-0.4.9 + vendor/linux-raw-sys-0.4.3 vendor/log-0.4.17 + vendor/lsp-server vendor/lzma-sys-0.1.17 vendor/mach vendor/memoffset-0.7.1 vendor/mimalloc vendor/miniz_oxide-0.6.2 - vendor/mio + vendor/mio-0.8.5 + vendor/miow-0.5.0 vendor/miow vendor/nix + vendor/normpath vendor/notify + vendor/ntapi-0.4.0 vendor/ntapi vendor/num_cpus-1.13.1 vendor/num_cpus-1.15.0 - vendor/object-0.30.3 + vendor/object-0.30.4 vendor/once_cell-1.12.0 vendor/once_cell-1.16.0 - vendor/once_cell-1.17.1 vendor/opener-0.5.0 vendor/openssl-src vendor/output_vt100 vendor/parking_lot_core-0.9.6 vendor/paste - vendor/percent-encoding-2.2.0 vendor/pest-2.6.0 vendor/pest_derive-2.6.0 vendor/pest_generator-2.6.0 @@ -182,65 +179,70 @@ Files-Excluded: vendor/petgraph vendor/pin-project-lite-0.2.9 vendor/pkg-config-0.3.25 + vendor/pretty_assertions-1.3.0 vendor/proc-macro2-1.0.60 + vendor/proc-macro2-1.0.63 vendor/protobuf vendor/protobuf-support - vendor/pulldown-cmark-0.9.2 vendor/pulldown-cmark-to-cmark vendor/quote-1.0.26 vendor/quote-1.0.28 + vendor/quote-1.0.29 vendor/rayon-1.6.0 vendor/rayon-core-1.10.1 vendor/redox_syscall-0.2.13 vendor/regalloc2 vendor/regex-1.5.6 - vendor/regex-1.7.3 vendor/regex-syntax-0.6.26 vendor/region vendor/rustc-build-sysroot - vendor/rustc-demangle-0.1.22 + vendor/rustix-0.37.20 vendor/rustix-0.37.6 + vendor/rustix-0.38.2 vendor/ryu-1.0.10 vendor/salsa vendor/salsa-macros vendor/schannel vendor/scip - vendor/security-framework - vendor/security-framework-sys + vendor/security-framework-2.9.1 + vendor/semver-1.0.17 + vendor/serde-1.0.156 vendor/serde-1.0.160 + vendor/serde-1.0.164 + vendor/serde_derive-1.0.156 vendor/serde_derive-1.0.160 + vendor/serde_derive-1.0.164 vendor/serde_json-1.0.81 - vendor/serde_json-1.0.96 - vendor/serde_spanned-0.6.2 + vendor/serde_json-1.0.97 + vendor/serde_json-1.0.99 vendor/sha2-0.10.2 - vendor/sha2-0.10.6 vendor/slice-group-by + vendor/smallvec-1.10.0 vendor/syn-1.0.102 - vendor/syn-2.0.15 + vendor/syn-2.0.18 + vendor/syn-2.0.27 + vendor/syn-2.0.8 vendor/tar-0.4.38 vendor/target-lexicon - vendor/thiserror-1.0.39 - vendor/thiserror-impl-1.0.39 + vendor/tempfile-3.6.0 + vendor/thiserror-1.0.40 + vendor/thiserror-1.0.44 + vendor/thiserror-impl-1.0.40 + vendor/thiserror-impl-1.0.44 vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl vendor/tikv-jemalloc-sys - vendor/time-0.3.20 - vendor/time-core-0.1.0 vendor/toml-0.5.9 - vendor/toml-0.7.4 - vendor/toml_datetime-0.6.2 - vendor/toml_edit-0.19.10 - vendor/tracing-attributes-0.1.23 - vendor/tracing-subscriber-0.3.16 - vendor/tracing-tree-0.2.2 + vendor/toml-0.7.5 + vendor/toml_edit-0.19.11 vendor/typed-arena vendor/typenum-1.15.0 vendor/unicode-ident-1.0.0 - vendor/unicode-ident-1.0.8 - vendor/url-2.3.1 + vendor/vcpkg vendor/walkdir-2.3.2 vendor/wasmtime-jit-icache-coherence + vendor/web-sys-0.3.61 vendor/winapi vendor/winapi-i686-pc-windows-gnu vendor/winapi-util @@ -267,7 +269,8 @@ Files-Excluded: vendor/windows_x86_64_gnullvm vendor/windows_x86_64_msvc-0.42.2 vendor/windows_x86_64_msvc - vendor/winnow-0.4.6 + vendor/winnow-0.4.7 + vendor/winreg vendor/xz2-0.1.6 vendor/yaml-merge-keys vendor/yaml-rust @@ -325,9 +328,7 @@ Copyright: 2016-2019 Jorge Aparicio <japaricious@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang-nursery/compiler-builtins -Files: - vendor/ahash/* - vendor/ahash-0.*/* +Files: vendor/ahash/* Copyright: 2019-2022 Tom Kaitchuck <Tom.Kaitchuck@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/tkaitchuck/ahash @@ -337,6 +338,11 @@ 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/anes/* +Copyright: 2019-2023 Robert Vojta <rvojta@me.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/zrzka/anes-rs + Files: vendor/anstream/* vendor/anstyle/* @@ -390,7 +396,9 @@ 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-sys/* +Files: + vendor/core-foundation/* + 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 @@ -694,10 +702,19 @@ Copyright: 2014-2018 Kang Seonghoon <public+rust@mearie.org> License: MIT or Apache-2.0 Comment: see https://github.com/chronotope/chrono +Files: + vendor/ciborium/* + vendor/ciborium-io/* + vendor/ciborium-ll/* +Copyright: 2020-2024 Nathaniel McCallum <npmccallum@profian.com> +License: Apache-2.0 +Comment: see https://github.com/enarx/ciborium + Files: vendor/clap/* - vendor/clap-2.*/* + vendor/clap-4.*/* vendor/clap_builder/* + vendor/clap_builder-4.*/* vendor/clap_complete/* vendor/clap_derive/* vendor/clap_lex/* @@ -774,13 +791,6 @@ 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 @@ -798,6 +808,14 @@ Copyright: 2019-2022 Acrimon <joel.wejdenstal@gmail.com> License: MIT Comment: see https://github.com/xacrimon/dashmap +Files: + vendor/darling/* + vendor/darling_core/* + vendor/darling_macro/* +Copyright: 2017-2024 Ted Driggs <ted.driggs@outlook.com> +License: MIT +Comment: see https://github.com/TedDriggs/darling + Files: vendor/datafrog/* Copyright: 2018 Frank McSherry <fmcsherry@me.com> @@ -816,6 +834,11 @@ Copyright: 2016-2020 Nick Cameron <ncameron@mozilla.com> License: MIT Comment: see https://github.com/nrc/derive-new +Files: vendor/derive_setters/* +Copyright: 2019-2023 Lymia Aluysia <lymia@lymiahugs.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/Lymia/derive_setters + Files: vendor/diff/* Copyright: 2015-2017 Utkarsh Kukreti <utkarshkukreti@gmail.com> License: MIT or Apache-2.0 @@ -829,7 +852,6 @@ Files: vendor/quote/* vendor/syn/* vendor/syn-1.*/* - vendor/syn-2.*/* vendor/unicode-ident/* Copyright: 2016-2024 David Tolnay <dtolnay@gmail.com> License: MIT or Apache-2.0 @@ -910,6 +932,11 @@ Copyright: 2015-2020 Niko Matsakis <niko@alum.mit.edu> License: MIT or Apache-2.0 Comment: see https://github.com/nikomatsakis/ena +Files: vendor/encoding_rs/* +Copyright: 2016-2024 Henri Sivonen <hsivonen@hsivonen.fi> +License: (Apache-2.0 OR MIT) AND BSD-3-Clause +Comment: see https://github.com/hsivonen/encoding_rs + Files: vendor/errno/* Copyright: 2015-2022 Chris Wong <lambda.fairy@gmail.com> License: MIT or Apache-2.0 @@ -925,6 +952,11 @@ Copyright: 2016-2023 Josh Stone <cuviper@gmail.com> License: Apache-2.0 OR MIT Comment: see https://github.com/cuviper/equivalent +Files: vendor/escargot/* +Copyright: 2018-2024 Ed Page <eopage@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/crate-ci/escargot.git + Files: vendor/expect-test/* Copyright: 2020-2022 rust-analyzer developers License: MIT OR Apache-2.0 @@ -941,7 +973,9 @@ Copyright: 2016-2019 Steven Fackler <sfackler@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/sfackler/rust-fallible-iterator -Files: vendor/fastrand/* +Files: + vendor/fastrand/* + vendor/fastrand-1.*/* Copyright: 2020-2023 Stjepan Glavina <stjepang@gmail.com> License: Apache-2.0 OR MIT Comment: see https://github.com/smol-rs/fastrand @@ -999,6 +1033,11 @@ Copyright: 2020-2020 Andrew Hickman <andrew.hickman1@sky.com> License: MIT or Apache-2.0 Comment: see https://github.com/andrewhickman/fs-err +Files: vendor/fs_extra/* +Copyright: 2017-2023 Denis Kurilenko <webdesus@gmail.com> +License: MIT +Comment: see https://github.com/webdesus/fs_extra + Files: vendor/futf/* Copyright: 2015-2018 Keegan McAllister <kmcallister@mozilla.com> License: MIT or Apache-2.0 @@ -1095,6 +1134,12 @@ 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/h2/* +Copyright: 2017-2024 Carl Lerche <me@carllerche.com> + 2017-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT +Comment: see https://github.com/hyperium/h2 + Files: vendor/half/* Copyright: 2016-2024 Kathryn Long <squeeself@gmail.com> License: MIT OR Apache-2.0 @@ -1136,11 +1181,40 @@ Copyright: 2014-2020 The html5ever Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/servo/html5ever +Files: vendor/http/* +Copyright: 2017-2024 Alex Crichton <alex@alexcrichton.com> + 2017-2024 Carl Lerche <me@carllerche.com> + 2017-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/hyperium/http + +Files: vendor/httparse/* +Copyright: 2015-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/seanmonstar/httparse + +Files: vendor/http-body/* +Copyright: 2019-2024 Carl Lerche <me@carllerche.com> + 2019-2024 Lucio Franco <luciofranco14@gmail.com> + 2019-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT +Comment: see https://github.com/hyperium/http-body + +Files: vendor/httpdate/* +Copyright: 2016-2023 Pyfisch <pyfisch@posteo.org> +License: MIT or Apache-2.0 +Comment: see https://github.com/pyfisch/httpdate + Files: vendor/http-auth/* Copyright: 2021-2023 Scott Lamp <slamb@slamb.org> License: MIT or Apache-2.0 Comment: see https://github.com/scottlamb/http-auth +Files: vendor/humansize/* +Copyright: 2016-2022 Leopold Arkham <leopold.arkham@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/LeopoldArkham/humansize + Files: vendor/humantime/* vendor/humantime-*/* @@ -1151,6 +1225,16 @@ Copyright: 2005-2013 Rich Felker License: MIT or Apache-2.0 +Files: vendor/hyper/* +Copyright: 2014-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT +Comment: see https://github.com/hyperium/hyper + +Files: vendor/hyper-tls/* +Copyright: 2017-2023 Sean McArthur <sean@seanmonstar.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/hyperium/hyper-tls + Files: vendor/if_chain/* Copyright: 2016-2020 Chris Wong <lambda.fairy@gmail.com> License: MIT or Apache-2.0 @@ -1174,6 +1258,11 @@ Copyright: 2013-2021 The rust-url developers License: MIT or Apache-2.0 Comment: see https://github.com/servo/rust-url/ +Files: vendor/ident_case/* +Copyright: 2017-2021 Ted Driggs <ted.driggs@outlook.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/TedDriggs/ident_case + Files: vendor/imara-diff/* Copyright: 2022-2023 pascalkuthe <pascalkuthe@semimod.de> License: Apache-2.0 @@ -1224,6 +1313,11 @@ Copyright: 2021-2022 Dan Gohman <dev@sunfishcode.online> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT Comment: see https://github.com/sunfishcode/io-lifetimes +Files: vendor/ipnet/* +Copyright: 2017-2023 Kris Price <kris@krisprice.nz> +License: MIT OR Apache-2.0 +Comment: see https://github.com/krisprice/ipnet + Files: vendor/is-terminal/* Copyright: 2022-2023 softprops <d.tangren@gmail.com> 2022-2023 Dan Gohman <dev@sunfishcode.online> @@ -1239,6 +1333,7 @@ Files: vendor/js-sys/* vendor/wasm-bindgen/* vendor/wasm-bindgen-backend/* + vendor/wasm-bindgen-futures/* vendor/wasm-bindgen-macro-support/* vendor/wasm-bindgen-macro/* vendor/wasm-bindgen-shared/* @@ -1287,6 +1382,11 @@ Copyright: 2014-2024 Ed Page <eopage@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/cobalt-org/kstring +Files: vendor/la-arena/* +Copyright: 2024 rust-analyzer team +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust-analyzer/tree/master/lib/la-arena + Files: vendor/lazycell/* Copyright: 2016-2020 Alex Crichton <alex@alexcrichton.com> 2016-2020 Nikita Pekin <contact@nikitapek.in> @@ -1306,7 +1406,9 @@ Copyright: 2016-2022 Nick Fitzgerald <fitzgen@gmail.com> License: Apache-2.0 or MIT Comment: see https://github.com/gimli-rs/leb128 -Files: vendor/libloading/* +Files: + vendor/libloading/* + vendor/libloading-0.7.4/* Copyright: 2015-2022 Simonas Kazlauskas <libloading@kazlauskas.me> License: ISC Comment: see https://github.com/nagisa/rust_libloading/ @@ -1331,6 +1433,13 @@ 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/line-index/* +Copyright: + 2024 Ariel Davis <ariel.z.davis@icloud.com> + 2024 rust-analyzer team +License: MIT or Apache-2.0 +Comment: see https://github.com/rust-lang/rust-analyzer/tree/master/lib/line-index + Files: vendor/linux-raw-sys/* vendor/linux-raw-sys-0.*/* @@ -1407,6 +1516,18 @@ Copyright: 2017-2020 Frommi <daniil.liferenko@gmail.com> License: MIT Comment: see https://github.com/Frommi/miniz_oxide +Files: vendor/mio/* +Copyright: 2014-2024 Carl Lerche <me@carllerche.com> + 2014-2024 Thomas de Zeeuw <thomasdezeeuw@gmail.com> + 2014-2024 Tokio Contributors <team@tokio.rs> +License: MIT +Comment: see https://github.com/tokio-rs/mio + +Files: vendor/native-tls/* +Copyright: 2016-2024 Steven Fackler <sfackler@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/sfackler/rust-native-tls + Files: vendor/new_debug_unreachable/* Copyright: 2014-2018 Matt Brubeck <mbrubeck@limpet.net> 2014-2018 Jonathan Reem <jonathan.reem@gmail.com> @@ -1465,8 +1586,10 @@ 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> +Files: + vendor/opener/* + vendor/opener-0.*/* +Copyright: 2018-2024 Brian Bowman <seeker14491@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/Seeker14491/opener @@ -1617,11 +1740,6 @@ Copyright: 2017-2022 Colin Kiegel <kiegel@gmx.de> License: MIT or Apache-2.0 Comment: see https://github.com/colin-kiegel/rust-pretty-assertions -Files: vendor/pretty_env_logger/* -Copyright: 2016-2023 Sean McArthur <sean@seanmonstar> -License: MIT or Apache-2.0 -Comment: see https://github.com/seanmonstar/pretty-env-logger - Files: vendor/proc-macro-hack/* Copyright: 2016-2022 David Tolnay <dtolnay@gmail.com> License: MIT OR Apache-2.0 @@ -1699,6 +1817,11 @@ Copyright: 2018-2020 Andrew Gallant <jamslam@gmail.com> License: Unlicense or MIT Comment: see https://github.com/BurntSushi/regex-automata +Files: vendor/reqwest/* +Copyright: 2016-2024 Sean McArthur <sean@seanmonstar.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/seanmonstar/reqwest + Files: vendor/rowan/* Copyright: 2018-2022 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 @@ -1709,6 +1832,11 @@ Copyright: 2010-2022 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang/rust +Files: vendor/rustc_apfloat/* +Copyright: 2003-2017 University of Illinois at Urbana-Champaign. +License: Apache-2.0 with LLVM exception +Comment: see https://github.com/rust-lang/rustc_apfloat , in particular LICENSE-DETAILS.md + Files: vendor/rustc_tools_util/* Copyright: 2014-2022 The Rust Project Developers License: MIT or Apache-2.0 @@ -1760,6 +1888,14 @@ 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/security-framework/* + vendor/security-framework-sys/* +Copyright: 2015-2024 Steven Fackler <sfackler@gmail.com> + 2015-2024 Kornel <kornel@geekhood.net> +License: MIT OR Apache-2.0 +Comment: see https://github.com/kornelski/rust-security-framework + Files: vendor/self_cell/* Copyright: 2020-2021 Lukas Bergdoll <lukas.bergdoll@gmail.com> License: Apache-2.0 @@ -1776,7 +1912,6 @@ Comment: Files: vendor/serde/* - vendor/serde-1.*/* vendor/serde_json/* Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com> License: MIT or Apache-2.0 @@ -1784,15 +1919,7 @@ 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/* - vendor/serde_derive-1.*/* +Files: vendor/serde_derive/* Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com> 2016-2017 David Tolnay <dtolnay@gmail.com> License: MIT or Apache-2.0 @@ -1815,6 +1942,11 @@ Copyright: License: MIT or Apache-2.0 Comment: see https://github.com/toml-rs/toml +Files: vendor/serde_urlencoded/* +Copyright: 2016-2024 Anthony Ramine <n.oxyde@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/nox/serde_urlencoded + Files: vendor/serde-value/* Copyright: 2016-2020 arcnmx License: MIT @@ -1949,7 +2081,9 @@ Copyright: License: MIT Comment: see https://github.com/mystor/synstructure -Files: vendor/sysinfo/* +Files: + vendor/sysinfo/* + vendor/sysinfo-0.*/* Copyright: 2015-2022 Guillaume Gomez <guillaume1.gomez@gmail.com> License: MIT Comment: see https://github.com/GuillaumeGomez/sysinfo @@ -1992,11 +2126,6 @@ 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-2024 Martin Geisler <martin@geisler.net> -License: MIT -Comment: see https://github.com/mgeisler/textwrap - Files: vendor/thin-vec/* Copyright: 2017-2022 Aria Beingessner <a.beingessner@gmail.com> License: MIT or Apache-2.0 @@ -2009,6 +2138,15 @@ Copyright: 2019-2020 David Tolnay <dtolnay@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/dtolnay/thiserror +Files: + vendor/thiserror-core/* + vendor/thiserror-core-impl/* +Copyright: + 2019-2023 David Tolnay <dtolnay@gmail.com> + 2022-2023 Florian Uekermann <florian@code.green> +License: MIT or Apache-2.0 +Comment: https://github.com/FlorianUekermann/thiserror/tree/core + Files: vendor/thorin-dwp/* Copyright: 2021-2022 David Wood <david.wood@huawei.com> License: MIT OR Apache-2.0 @@ -2073,6 +2211,7 @@ Files: vendor/tracing/* vendor/tracing-attributes/* vendor/tracing-core/* + vendor/tracing-core-0.*/* vendor/tracing-error/* vendor/tracing-log/* vendor/tracing-subscriber/* @@ -2095,6 +2234,11 @@ Copyright: 2018-2024 The Servo Project Developers License: MIT OR Apache-2.0 Comment: see https://github.com/Manishearth/triomphe +Files: vendor/try-lock/* +Copyright: 2018-2023 Sean McArthur <sean@seanmonstar.com> +License: MIT +Comment: see https://github.com/seanmonstar/try-lock + Files: vendor/twox-hash/* Copyright: 2015-2022 Jake Goulding <jake.goulding@gmail.com> License: MIT @@ -2131,6 +2275,12 @@ Copyright: 2018-2023 Phil Booth <pmbooth@gmail.com> License: Apache-2.0 Comment: see https://gitlab.com/philbooth/unicode-bom +Files: vendor/unicode-properties/* +Copyright: 2022-2024 Charles Lew <crlf0710@gmail.com> + 2022-2024 Manish Goregaokar <manishsmail@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/unicode-rs/unicode-properties + Files: vendor/varisat/* vendor/varisat-checker/* @@ -2152,11 +2302,6 @@ Copyright: 2017-2019 Sergio Benitez <sb@sergio.bz> License: MIT or Apache-2.0 Comment: see https://github.com/SergioBenitez/version_check -Files: vendor/vcpkg/* -Copyright: 2017-2024 Jim McGrath <jimmc2@gmail.com> -License: MIT or Apache-2.0 -Comment: see https://github.com/mcgoo/vcpkg-rs - Files: vendor/vte/* Copyright: 2016-2024 Joe Wilm <joe@jwilm.com> 2016-2024 Christian Duerr <contact@christianduerr.com> @@ -2168,6 +2313,17 @@ Copyright: 2016-2024 Christian Duerr <contact@christianduerr.com> License: Apache-2.0 OR MIT Comment: see https://github.com/jwilm/vte +Files: vendor/want/* +Copyright: 2018-2023 Sean McArthur <sean@seanmonstar.com> +License: MIT +Comment: see https://github.com/seanmonstar/want + +Files: vendor/xz/* +Copyright: 2016-2023 Hyeon Kim <simnalamburt@gmail.com> + 2016-2023 Alex Crichton <alex@alexcrichton.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/xz2-rs + Files: vendor/ucd-parse/* vendor/ucd-trie/* @@ -2349,6 +2505,21 @@ Copyright: 2016-2022 Tokio Contributors <team@tokio.rs> License: MIT Comment: see https://github.com/tokio-rs/tokio +Files: vendor/tokio-native-tls/* +Copyright: 2017-2023 Tokio Contributors <team@tokio.rs> +License: MIT +Comment: see https://github.com/tokio-rs/tls + +Files: vendor/tokio-util/* +Copyright: 2016-2024 Tokio Contributors <team@tokio.rs> +License: MIT +Comment: see https://github.com/tokio-rs/tokio + +Files: vendor/tower-service/* +Copyright: 2016-2023 Tower Maintainers <team@tower-rs.com> +License: MIT +Comment: see https://github.com/tower-rs/tower + Files: vendor/valuable/* Copyright: 2021 Valuable Contributors diff --git a/debian/libstd-rust-1.72.lintian-overrides b/debian/libstd-rust-1.72.lintian-overrides deleted file mode 100644 index c7ff5a226..000000000 --- a/debian/libstd-rust-1.72.lintian-overrides +++ /dev/null @@ -1,16 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.72 binary: package-name-doesnt-match-sonames -libstd-rust-1.72 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.72 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.72 binary: shlib-without-versioned-soname -libstd-rust-1.72 binary: unused-shlib-entry-in-control-file - -# can trigger if all its so files' hashes start with a latter and not a digit -libstd-rust-1.72 binary: empty-shlibs - -# 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.72 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.72.install b/debian/libstd-rust-1.73.install index cd4545cca..cd4545cca 100644 --- a/debian/libstd-rust-1.72.install +++ b/debian/libstd-rust-1.73.install diff --git a/debian/libstd-rust-1.73.lintian-overrides b/debian/libstd-rust-1.73.lintian-overrides new file mode 100644 index 000000000..87e0de4a8 --- /dev/null +++ b/debian/libstd-rust-1.73.lintian-overrides @@ -0,0 +1,16 @@ +# "libstd" just seemed too generic +libstd-rust-1.73 binary: package-name-doesnt-match-sonames +libstd-rust-1.73 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.73 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.73 binary: shlib-without-versioned-soname +libstd-rust-1.73 binary: unused-shlib-entry-in-control-file + +# can trigger if all its so files' hashes start with a latter and not a digit +libstd-rust-1.73 binary: empty-shlibs + +# 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.73 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.72.triggers b/debian/libstd-rust-1.73.triggers index a88c20f92..a88c20f92 100644 --- a/debian/libstd-rust-1.72.triggers +++ b/debian/libstd-rust-1.73.triggers diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch index 3f8926877..a3f7d112d 100644 --- a/debian/patches/c-2002_disable-net-tests.patch +++ b/debian/patches/c-2002_disable-net-tests.patch @@ -523,7 +523,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs +++ rust/src/tools/cargo/tests/testsuite/credential_process.rs -@@ -8,7 +8,7 @@ fn toml_bin(proj: &Project, name: &str) +@@ -7,7 +7,7 @@ fn toml_bin(proj: &Project, name: &str) proj.bin(name).display().to_string().replace('\\', "\\\\") } @@ -532,16 +532,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn gated() { let _alternative = registry::RegistryBuilder::new() .alternative() -@@ -65,7 +65,7 @@ or use environment variable CARGO_REGIST - .run(); - } - --#[cargo_test] -+#[allow(dead_code)] - fn warn_both_token_and_process() { - // Specifying both credential-process and a token in config should issue a warning. - let _server = registry::RegistryBuilder::new() -@@ -212,7 +212,7 @@ fn get_token_test() -> (Project, TestReg +@@ -120,7 +120,7 @@ fn get_token_test() -> (Project, TestReg (p, server) } @@ -550,8 +541,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn publish() { // Checks that credential-process is used for `cargo publish`. let (p, _t) = get_token_test(); -@@ -237,7 +237,7 @@ You may press ctrl-c [..] - assert_eq!(calls, 1); +@@ -143,7 +143,7 @@ You may press ctrl-c [..] + .run(); } -#[cargo_test] @@ -559,17 +550,17 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn basic_unsupported() { // Non-action commands don't support login/logout. let registry = registry::RegistryBuilder::new() -@@ -280,7 +280,7 @@ the credential-process configuration val +@@ -181,7 +181,7 @@ Caused by: .run(); } -#[cargo_test] +#[allow(dead_code)] fn login() { - let server = registry::RegistryBuilder::new() + let registry = registry::RegistryBuilder::new() .no_configure_token() -@@ -337,7 +337,7 @@ fn login() { - ); +@@ -203,7 +203,7 @@ fn login() { + .run(); } -#[cargo_test] @@ -577,8 +568,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn logout() { let server = registry::RegistryBuilder::new() .no_configure_token() -@@ -395,7 +395,7 @@ token for `crates-io` has been erased! - ); +@@ -223,7 +223,7 @@ fn logout() { + .run(); } -#[cargo_test] @@ -586,7 +577,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn yank() { let (p, _t) = get_token_test(); -@@ -410,7 +410,7 @@ fn yank() { +@@ -239,7 +239,7 @@ fn yank() { .run(); } @@ -595,16 +586,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn owner() { let (p, _t) = get_token_test(); -@@ -425,7 +425,7 @@ fn owner() { - .run(); - } - --#[cargo_test] -+#[allow(dead_code)] - fn libexec_path() { - // cargo: prefixed names use the sysroot - let server = registry::RegistryBuilder::new() -@@ -459,7 +459,7 @@ Caused by: +@@ -255,7 +255,7 @@ fn owner() { .run(); } @@ -612,4 +594,4 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs +#[allow(dead_code)] fn invalid_token_output() { // Error when credential process does not output the expected format for a token. - let _server = registry::RegistryBuilder::new() + let cred_proj = project() diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch index 192571e46..c1d59a40a 100644 --- a/debian/patches/c-update-libgit2.patch +++ b/debian/patches/c-update-libgit2.patch @@ -2,26 +2,26 @@ Index: rust/src/tools/cargo/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/Cargo.toml +++ rust/src/tools/cargo/Cargo.toml -@@ -33,8 +33,8 @@ env_logger = "0.10.0" - filetime = "0.2.9" - flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } +@@ -37,8 +37,8 @@ curl-sys = "0.4.65" + filetime = "0.2.21" + flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] } fwdansi = "1.1.0" --git2 = "0.17.1" +-git2 = "0.17.2" -git2-curl = "0.18.0" +git2 = "0.18" +git2-curl = "0.19.0" gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } - glob = "0.3.0" -@@ -52,7 +52,7 @@ jobserver = "0.1.26" - lazy_static = "1.3.0" - lazycell = "1.2.0" - libc = "0.2.144" --libgit2-sys = "0.15.1" + glob = "0.3.1" +@@ -56,7 +56,7 @@ jobserver = "0.1.26" + lazy_static = "1.4.0" + lazycell = "1.3.0" + libc = "0.2.147" +-libgit2-sys = "0.15.2" +libgit2-sys = "0.16.1" - log = "0.4.17" - memchr = "2.1.3" - miow = "0.5.0" + libloading = "0.8.0" + memchr = "2.5.0" + miow = "0.6.0" Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 1cea0a8bf..3542cd9c5 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -4,17 +4,17 @@ Subject: d-0000-ignore-removed-submodules --- Cargo.toml | 7 ----- - src/bootstrap/bootstrap.py | 6 +---- + 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, 25 insertions(+), 65 deletions(-) + 5 files changed, 24 insertions(+), 64 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 20b1c65..16d4ebe 100644 +index d2e84d5..a852385 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -20,22 +20,15 @@ members = [ +@@ -19,22 +19,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -38,10 +38,10 @@ index 20b1c65..16d4ebe 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 149350e..2813c89 100644 +index f44a05a..27da09c 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -946,10 +946,6 @@ class RustBuild(object): +@@ -944,10 +944,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(self.verbose)) @@ -53,10 +53,10 @@ index 149350e..2813c89 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 05b66f9..ff1f0eb 100644 +index b366619..8866581 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> { +@@ -497,20 +497,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +89,7 @@ index 05b66f9..ff1f0eb 100644 submodules_paths }; -@@ -646,25 +646,14 @@ impl<'a> Builder<'a> { +@@ -684,25 +684,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -112,10 +112,10 @@ index 05b66f9..ff1f0eb 100644 - llvm::Lld, - llvm::CrtBeginEnd, - tool::RustdocGUITest, + tool::OptimizedDist ), Kind::Check | Kind::Clippy | Kind::Fix => describe!( - check::Std, -@@ -672,12 +661,7 @@ impl<'a> Builder<'a> { +@@ -711,12 +700,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -128,7 +128,7 @@ index 05b66f9..ff1f0eb 100644 check::Bootstrap ), Kind::Test => describe!( -@@ -706,7 +690,6 @@ impl<'a> Builder<'a> { +@@ -745,7 +729,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -136,7 +136,7 @@ index 05b66f9..ff1f0eb 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -722,7 +705,6 @@ impl<'a> Builder<'a> { +@@ -761,7 +744,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -144,7 +144,7 @@ index 05b66f9..ff1f0eb 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -759,7 +741,6 @@ impl<'a> Builder<'a> { +@@ -798,7 +780,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -152,7 +152,7 @@ index 05b66f9..ff1f0eb 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -777,12 +758,9 @@ impl<'a> Builder<'a> { +@@ -816,12 +797,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -165,7 +165,7 @@ index 05b66f9..ff1f0eb 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -799,11 +777,9 @@ impl<'a> Builder<'a> { +@@ -838,11 +816,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -177,7 +177,7 @@ index 05b66f9..ff1f0eb 100644 install::LlvmTools, install::Src, install::Rustc -@@ -813,7 +789,6 @@ impl<'a> Builder<'a> { +@@ -852,7 +828,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -185,7 +185,7 @@ index 05b66f9..ff1f0eb 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> { +@@ -1990,10 +1965,7 @@ impl<'a> Builder<'a> { } } @@ -198,10 +198,10 @@ index 05b66f9..ff1f0eb 100644 } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index eed7a58..c3bf972 100644 +index d0d62db..3c4c4e3 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -2129,17 +2129,7 @@ impl Step for RustcGuide { +@@ -2143,17 +2143,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -210,7 +210,7 @@ index eed7a58..c3bf972 100644 - - let src = builder.src.join(relative_path); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); -- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() { +- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) { - ToolState::TestPass - } else { - ToolState::TestFail @@ -221,7 +221,7 @@ index eed7a58..c3bf972 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index 3050cf7..174e1f0 100644 +index f6a50bf..bd38d4f 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ 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 4cdf7fbbb..bae687742 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -8,7 +8,7 @@ Subject: d-0001-pkg-config-no-special-snowflake 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs -index 3653032..7b82fa5 100644 +index 3653032..553ac75 100644 --- a/vendor/pkg-config/src/lib.rs +++ b/vendor/pkg-config/src/lib.rs @@ -117,11 +117,8 @@ pub enum Error { diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index c6acfd458..6e7914c45 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -14,7 +14,7 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase 7 files changed, 47 insertions(+), 234 deletions(-) diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs -index c8a3700..4095c03 100644 +index 7f73cac..e4805cc 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -159,7 +159,17 @@ impl Checker { diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index 09b8db752..a947d676b 100644 --- a/debian/patches/d-0005-no-jemalloc.patch +++ b/debian/patches/d-0005-no-jemalloc.patch @@ -26,12 +26,12 @@ index 41003ad..0578f7b 100644 max_level_info = ['rustc_driver_impl/max_level_info'] rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler'] diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml -index 602e742..5faecc5 100644 +index 937834a..fd98d85 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" } + la-arena.workspace = true countme = { version = "3.0.1", features = ["enable"] } -jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true } 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 21e1e0b06..1e8c91ca6 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -8,16 +8,15 @@ Last-Update: 2023-05-17 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 7e383be..384fe45 100644 +index 0e189a6..4071e8c 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml -@@ -203,8 +203,6 @@ test = false +@@ -217,7 +217,5 @@ test = false doc = false [features] -vendored-openssl = ["openssl/vendored"] -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 b9a1f1b69..ef2fe174f 100644 --- a/debian/patches/d-0011-cargo-remove-nghttp2.patch +++ b/debian/patches/d-0011-cargo-remove-nghttp2.patch @@ -8,7 +8,7 @@ Last-Update: 2023-05-17 <YYYY-MM-DD, last update of the meta-information, option 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index d89f441..6d89163 100644 +index 174d6eb..ffa79ac 100644 --- a/vendor/curl-sys/Cargo.toml +++ b/vendor/curl-sys/Cargo.toml @@ -52,7 +52,7 @@ version = "0.3.3" diff --git a/debian/patches/d-0020-remove-windows-dependencies.patch b/debian/patches/d-0020-remove-windows-dependencies.patch index 0a6bd3235..3bb0bdcb8 100644 --- a/debian/patches/d-0020-remove-windows-dependencies.patch +++ b/debian/patches/d-0020-remove-windows-dependencies.patch @@ -11,22 +11,23 @@ Subject: d-0020-remove-windows-dependencies compiler/rustc_session/Cargo.toml | 7 ---- library/backtrace/Cargo.toml | 13 ------- src/bootstrap/Cargo.toml | 15 -------- - src/tools/cargo/Cargo.toml | 18 ++-------- + src/tools/cargo/Cargo.toml | 20 ++--------- .../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 -- + .../cargo/credential/cargo-credential/Cargo.toml | 3 -- src/tools/compiletest/Cargo.toml | 10 ------ src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 -- .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ---- src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 --- - 15 files changed, 22 insertions(+), 133 deletions(-) + 16 files changed, 22 insertions(+), 138 deletions(-) diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml -index 984efa2..f4c194b 100644 +index 34d0e2d..2cb22f0 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" +@@ -45,7 +45,3 @@ libc = "0.2.50" + version = "0.32.0" default-features = false features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"] - @@ -34,12 +35,12 @@ index 984efa2..f4c194b 100644 -version = "0.48.0" -features = ["Win32_Globalization"] diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml -index a5c3cb3..5cf1462 100644 +index f77bd53..a3d1810 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" + version = "0.12" -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -55,10 +56,10 @@ index a5c3cb3..5cf1462 100644 memmap2 = "0.2.1" diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml -index 67352c5..f27cb40 100644 +index a7b0161..62c4249 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" } +@@ -57,12 +57,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" } [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -72,12 +73,12 @@ index 67352c5..f27cb40 100644 llvm = ['rustc_interface/llvm'] max_level_info = ['rustc_log/max_level_info'] diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml -index e8bcd7c..36a5ee6 100644 +index faab9f0..3ea55cb 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" ] } +@@ -27,13 +27,5 @@ serde = { version = "1.0.125", features = [ "derive" ] } serde_json = "1.0.59" + derive_setters = "0.1.6" -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -90,10 +91,10 @@ index e8bcd7c..36a5ee6 100644 [features] rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler'] diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml -index 1291d14..d9f8675 100644 +index e26d25d..fe343f8 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml -@@ -25,10 +25,3 @@ termize = "0.1.1" +@@ -24,10 +24,3 @@ termize = "0.1.1" [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -136,7 +137,7 @@ index cff2c9e..ad053f0 100644 [[example]] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml -index 85eb543..cf21349 100644 +index 74b9a23..e65e3c2 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -62,21 +62,6 @@ semver = "1.0.17" @@ -162,7 +163,7 @@ index 85eb543..cf21349 100644 pretty_assertions = "1.2" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 384fe45..7ed3853 100644 +index 4071e8c..1f8164f 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -2,7 +2,9 @@ @@ -172,19 +173,37 @@ index 384fe45..7ed3853 100644 - "credential/*", + "credential/cargo-credential", + "credential/cargo-credential-1password", -+ "credential/cargo-credential-gnome-secret", ++ "credential/cargo-credential-libsecret", "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" +@@ -21,8 +23,6 @@ bytesize = "1.2" + cargo = { path = "" } + cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" } + cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" } +-cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" } +-cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" } + cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" } + cargo-test-macro = { path = "crates/cargo-test-macro" } + cargo-test-support = { path = "crates/cargo-test-support" } +@@ -100,7 +100,6 @@ unicode-xid = "0.2.4" + url = "2.4.0" + varisat = "0.2.2" + walkdir = "2.3.3" -windows-sys = "0.48" [package] name = "cargo" -@@ -174,19 +175,6 @@ walkdir.workspace = true +@@ -125,8 +124,6 @@ bytesize.workspace = true + cargo-platform.workspace = true + cargo-credential.workspace = true + cargo-credential-libsecret.workspace = true +-cargo-credential-macos-keychain.workspace = true +-cargo-credential-wincred.workspace = true + cargo-util.workspace = true + clap = { workspace = true, features = ["wrap_help"] } + crates-io.workspace = true +@@ -186,21 +183,6 @@ walkdir.workspace = true [target.'cfg(not(windows))'.dependencies] openssl = { workspace = true, optional = true } @@ -195,17 +214,19 @@ index 384fe45..7ed3853 100644 -workspace = true -features = [ - "Win32_Foundation", +- "Win32_Security", - "Win32_Storage_FileSystem", +- "Win32_System_IO", - "Win32_System_Console", -- "Win32_System_Threading", - "Win32_System_JobObjects", +- "Win32_System_Threading", -] - [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 +index 085041a..fa0e603 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 @@ -254,12 +275,12 @@ index 305c809a..c656678 100644 +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 6145810..46af186 100644 +index 99a5942..39eb404 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 +@@ -19,10 +19,3 @@ shell-escape.workspace = true tempfile.workspace = true + tracing.workspace = true walkdir.workspace = true - -[target.'cfg(target_os = "macos")'.dependencies] @@ -269,18 +290,31 @@ index 6145810..46af186 100644 -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 +index 03bd555..32fdf26 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" +@@ -14,6 +14,3 @@ include = [ + license.workspace = true 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/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml +index 8cd1348..84b30cf 100644 +--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml ++++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml +@@ -14,8 +14,5 @@ serde_json.workspace = true + thiserror.workspace = true + time.workspace = true + +-[target.'cfg(windows)'.dependencies] +-windows-sys = { workspace = true, features = ["Win32_System_Console", "Win32_Foundation"] } +- + [dev-dependencies] + snapbox = { workspace = true, features = ["examples"] } diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml -index d2f2583..61f7be4 100644 +index ff1d5ce..61f7be4 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -27,13 +27,3 @@ anyhow = "1" @@ -289,7 +323,7 @@ index d2f2583..61f7be4 100644 libc = "0.2" - -[target.'cfg(windows)'.dependencies] --miow = "0.5" +-miow = "0.6" - -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -298,7 +332,7 @@ index d2f2583..61f7be4 100644 - "Win32_System_Diagnostics_Debug", -] diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml -index 5faecc5..0d39d3b 100644 +index fd98d85..8c1d1379 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"] } @@ -312,10 +346,10 @@ index 5faecc5..0d39d3b 100644 cpu_profiler = [] diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -index 5b72d57..df53f34 100644 +index 5bfac7e..04b23a1 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -@@ -77,12 +77,6 @@ tt.workspace = true +@@ -72,12 +72,6 @@ toolchain.workspace = true vfs-notify.workspace = true vfs.workspace = true @@ -329,7 +363,7 @@ index 5b72d57..df53f34 100644 expect-test = "1.4.0" xshell = "0.2.2" diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml -index a67f36a..bfbd00f 100644 +index 536f000..6ed37f5 100644 --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml +++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml @@ -19,10 +19,6 @@ jod-thread = "0.1.2" @@ -343,3 +377,16 @@ index a67f36a..bfbd00f 100644 [features] # Uncomment to enable for the whole crate graph # default = [ "backtrace" ] +Index: rust/src/tools/cargo/src/cargo/util/auth/mod.rs +=================================================================== +--- rust.orig/src/tools/cargo/src/cargo/util/auth/mod.rs ++++ rust/src/tools/cargo/src/cargo/util/auth/mod.rs +@@ -456,8 +456,6 @@ fn credential_action( + "cargo:token" => Box::new(TokenCredential::new(config)), + "cargo:paseto" => Box::new(PasetoCredential::new(config)), + "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), +- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), +- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), + "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), + process => Box::new(CredentialProcessCredential::new(process)), + }; diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 146c95eff..d925753da 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -7,69 +7,78 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> --- - vendor/android-tzdata/Cargo.toml | 1 + - vendor/anstream/Cargo.toml | 6 ----- - vendor/anstyle-query/Cargo.toml | 7 ------ - vendor/atty/Cargo.toml | 3 --- - vendor/backtrace-0.3.67/Cargo.toml | 14 ------------ - vendor/backtrace/Cargo.toml | 13 ----------- - vendor/chrono/Cargo.toml | 12 ---------- - vendor/colored/Cargo.toml | 4 ---- - 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/Cargo.toml | 6 ----- - vendor/fd-lock/Cargo.toml | 8 ------- - vendor/filetime/Cargo.toml | 7 ------ - vendor/gix-sec/Cargo.toml | 12 ---------- - vendor/home/Cargo.toml | 7 ------ - vendor/iana-time-zone/Cargo.toml | 4 ---- - vendor/ignore/Cargo.toml | 3 --- - vendor/io-close/Cargo.toml | 3 --- - vendor/io-lifetimes/Cargo.toml | 13 ----------- - vendor/is-terminal-0.4.7/Cargo.toml | 11 --------- - vendor/is-terminal/Cargo.toml | 11 --------- - vendor/libloading/Cargo.toml | 7 ------ - vendor/libssh2-sys/Cargo.toml | 5 ----- - vendor/nu-ansi-term/Cargo.toml | 10 --------- - 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/Cargo.toml | 3 --- - vendor/pretty_assertions/Cargo.toml | 6 ----- - vendor/rustix-0.37.11/Cargo.toml | 11 --------- - vendor/rustix-0.37.20/Cargo.toml | 16 -------------- - vendor/rustix/Cargo.toml | 17 -------------- - vendor/same-file/Cargo.toml | 2 -- - vendor/snapbox/Cargo.toml | 6 ----- - vendor/socket2/Cargo.toml | 8 ------- - vendor/stacker/Cargo.toml | 10 --------- - vendor/sysinfo/Cargo.toml | 38 -------------------------------- - 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 | 21 ------------------ - vendor/uuid/Cargo.toml | 4 ---- - vendor/walkdir/Cargo.toml | 3 --- - vendor/yansi-term/Cargo.toml | 3 --- - 48 files changed, 1 insertion(+), 397 deletions(-) + vendor/android-tzdata/Cargo.toml | 1 + + vendor/anstream/Cargo.toml | 6 ---- + vendor/anstyle-query/Cargo.toml | 7 ----- + vendor/atty/Cargo.toml | 3 -- + vendor/backtrace/Cargo.toml | 13 --------- + vendor/chrono/Cargo.toml | 12 -------- + vendor/colored/Cargo.toml | 4 --- + vendor/curl-sys-0.4.63+curl-8.1.2/Cargo.toml | 10 ------- + 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/Cargo.toml | 6 ---- + vendor/fd-lock/Cargo.toml | 8 ------ + vendor/filetime/Cargo.toml | 7 ----- + vendor/gix-sec/Cargo.toml | 12 -------- + vendor/home/Cargo.toml | 7 ----- + vendor/iana-time-zone/Cargo.toml | 4 --- + vendor/ignore/Cargo.toml | 3 -- + vendor/io-close/Cargo.toml | 3 -- + vendor/io-lifetimes/Cargo.toml | 13 --------- + vendor/is-terminal/Cargo.toml | 11 -------- + vendor/libloading-0.7.4/Cargo.toml | 6 ---- + vendor/libloading/Cargo.toml | 8 ------ + vendor/libssh2-sys/Cargo.toml | 8 ------ + vendor/libz-sys/Cargo.toml | 3 -- + vendor/mio/Cargo.toml | 11 -------- + vendor/native-tls/Cargo.toml | 3 -- + vendor/normpath/Cargo.toml | 10 ------- + vendor/nu-ansi-term/Cargo.toml | 10 ------- + vendor/opener-0.5.2/Cargo.toml | 4 --- + vendor/opener/Cargo.toml | 9 ------ + vendor/openssl-sys/Cargo.toml | 3 -- + vendor/os_info/Cargo.toml | 15 ---------- + vendor/parking_lot_core-0.8.6/Cargo.toml | 12 -------- + vendor/parking_lot_core/Cargo.toml | 3 -- + vendor/pretty_assertions-1.3.0/Cargo.toml | 6 ---- + vendor/reqwest/Cargo.toml | 3 -- + vendor/rustix-0.37.20/Cargo.toml | 16 ----------- + vendor/rustix-0.37.22/Cargo.toml | 16 ----------- + vendor/rustix/Cargo.toml | 17 ------------ + vendor/same-file/Cargo.toml | 2 -- + vendor/snapbox/Cargo.toml | 6 ---- + vendor/socket2/Cargo.toml | 8 ------ + vendor/stacker/Cargo.toml | 10 ------- + vendor/sysinfo-0.26.7/Cargo.toml | 38 -------------------------- + vendor/sysinfo/Cargo.toml | 41 ---------------------------- + vendor/tempfile-3.6.0/Cargo.toml | 7 ----- + 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 | 21 -------------- + vendor/uuid/Cargo.toml | 4 --- + vendor/walkdir/Cargo.toml | 3 -- + vendor/yansi-term/Cargo.toml | 3 -- + 57 files changed, 1 insertion(+), 487 deletions(-) -diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml -index 805128a..0682717 100644 ---- a/vendor/android-tzdata/Cargo.toml -+++ b/vendor/android-tzdata/Cargo.toml -@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/android-tzdata" +Index: rust/vendor/android-tzdata/Cargo.toml +=================================================================== +--- rust.orig/vendor/android-tzdata/Cargo.toml ++++ rust/vendor/android-tzdata/Cargo.toml +@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/ [dev-dependencies.zip] version = "0.6.4" +repository = "https://github.com/rust-cli/concolor" -diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml -index 75d78e2..a0eddb4 100644 ---- a/vendor/anstream/Cargo.toml -+++ b/vendor/anstream/Cargo.toml +Index: rust/vendor/anstream/Cargo.toml +=================================================================== +--- rust.orig/vendor/anstream/Cargo.toml ++++ rust/vendor/anstream/Cargo.toml @@ -136,10 +136,4 @@ auto = [ ] default = [ @@ -81,10 +90,10 @@ index 75d78e2..a0eddb4 100644 -[target."cfg(windows)".dependencies.anstyle-wincon] -version = "1.0.1" -optional = true -diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml -index 63a431c..0cf859b 100644 ---- a/vendor/anstyle-query/Cargo.toml -+++ b/vendor/anstyle-query/Cargo.toml +Index: rust/vendor/anstyle-query/Cargo.toml +=================================================================== +--- rust.orig/vendor/anstyle-query/Cargo.toml ++++ rust/vendor/anstyle-query/Cargo.toml @@ -70,10 +70,3 @@ replace = """ <!-- next-url --> [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" @@ -96,10 +105,10 @@ index 63a431c..0cf859b 100644 - "Win32_System_Console", - "Win32_Foundation", -] -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 +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" @@ -109,10 +118,10 @@ index d6bf2d0..7cebc31 100644 -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 f33884a..b43a0dd 100644 ---- a/vendor/backtrace/Cargo.toml -+++ b/vendor/backtrace/Cargo.toml +Index: rust/vendor/backtrace/Cargo.toml +=================================================================== +--- rust.orig/vendor/backtrace/Cargo.toml ++++ rust/vendor/backtrace/Cargo.toml @@ -127,18 +127,5 @@ serialize-serde = ["serde"] std = [] unix-backtrace = [] @@ -132,10 +141,10 @@ index f33884a..b43a0dd 100644 -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -optional = true -diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml -index 7f49bad..6229f0a 100644 ---- a/vendor/chrono/Cargo.toml -+++ b/vendor/chrono/Cargo.toml +Index: rust/vendor/chrono/Cargo.toml +=================================================================== +--- rust.orig/vendor/chrono/Cargo.toml ++++ rust/vendor/chrono/Cargo.toml @@ -107,7 +107,6 @@ __internal_bench = ["criterion"] alloc = [] clock = [ @@ -159,10 +168,10 @@ index 7f49bad..6229f0a 100644 - "sysinfoapi", -] -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 +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] @@ -171,12 +180,12 @@ index 3a6b59b..065eecb 100644 -version = "0.3" -features = ["consoleapi", "processenv", "winbase"] -default-features = false -diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index 6d89163..0b17324 100644 ---- a/vendor/curl-sys/Cargo.toml -+++ b/vendor/curl-sys/Cargo.toml +Index: rust/vendor/curl-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/curl-sys/Cargo.toml ++++ rust/vendor/curl-sys/Cargo.toml @@ -73,16 +73,6 @@ zlib-ng-compat = [ - version = "0.9" + version = "0.9.64" optional = true -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] @@ -192,10 +201,10 @@ index 6d89163..0b17324 100644 [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 +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 @@ -213,10 +222,10 @@ index bfb59f4..d9f6854 100644 [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 +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] @@ -226,10 +235,10 @@ index e9d8d0c..acb2eb7 100644 -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 9951d24..0a86f4d 100644 ---- a/vendor/dirs-sys/Cargo.toml -+++ b/vendor/dirs-sys/Cargo.toml +Index: rust/vendor/dirs-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/dirs-sys/Cargo.toml ++++ rust/vendor/dirs-sys/Cargo.toml @@ -22,6 +22,3 @@ version = "0.4" default-features = false [target."cfg(unix)".dependencies.libc] @@ -237,10 +246,10 @@ index 9951d24..0a86f4d 100644 -[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 +Index: rust/vendor/errno/Cargo.toml +=================================================================== +--- rust.orig/vendor/errno/Cargo.toml ++++ rust/vendor/errno/Cargo.toml @@ -41,9 +41,3 @@ version = "0.2" [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -251,10 +260,10 @@ index bf54b1f..7507a31 100644 - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] -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 +Index: rust/vendor/fd-lock/Cargo.toml +=================================================================== +--- rust.orig/vendor/fd-lock/Cargo.toml ++++ rust/vendor/fd-lock/Cargo.toml @@ -43,11 +43,3 @@ version = "3.0.8" [target."cfg(unix)".dependencies.rustix] version = "0.37.0" @@ -267,10 +276,10 @@ index d995177..b759d87 100644 - "Win32_Storage_FileSystem", - "Win32_System_IO", -] -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 +Index: rust/vendor/filetime/Cargo.toml +=================================================================== +--- rust.orig/vendor/filetime/Cargo.toml ++++ rust/vendor/filetime/Cargo.toml @@ -38,10 +38,3 @@ version = "0.2.9" [target."cfg(unix)".dependencies.libc] @@ -282,10 +291,10 @@ index 8547ec3..4ecd973 100644 - "Win32_Foundation", - "Win32_Storage_FileSystem", -] -diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml -index 254f82f..65248eb 100644 ---- a/vendor/gix-sec/Cargo.toml -+++ b/vendor/gix-sec/Cargo.toml +Index: rust/vendor/gix-sec/Cargo.toml +=================================================================== +--- rust.orig/vendor/gix-sec/Cargo.toml ++++ rust/vendor/gix-sec/Cargo.toml @@ -63,15 +63,3 @@ serde = [ [target."cfg(not(windows))".dependencies.libc] version = "0.2.123" @@ -302,10 +311,10 @@ index 254f82f..65248eb 100644 - "Win32_System_Memory", - "Win32_System_Threading", -] -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 +Index: rust/vendor/home/Cargo.toml +=================================================================== +--- rust.orig/vendor/home/Cargo.toml ++++ rust/vendor/home/Cargo.toml @@ -27,10 +27,3 @@ readme = "README.md" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/cargo" @@ -317,10 +326,10 @@ index cd608b1..eecfb89 100644 - "Win32_Foundation", - "Win32_UI_Shell", -] -diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml -index e06c705..572a8fd 100644 ---- a/vendor/iana-time-zone/Cargo.toml -+++ b/vendor/iana-time-zone/Cargo.toml +Index: rust/vendor/iana-time-zone/Cargo.toml +=================================================================== +--- rust.orig/vendor/iana-time-zone/Cargo.toml ++++ rust/vendor/iana-time-zone/Cargo.toml @@ -52,7 +52,3 @@ version = "0.1.5" [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] @@ -329,10 +338,10 @@ index e06c705..572a8fd 100644 -[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 +Index: rust/vendor/ignore/Cargo.toml +=================================================================== +--- rust.orig/vendor/ignore/Cargo.toml ++++ rust/vendor/ignore/Cargo.toml @@ -64,6 +64,3 @@ version = "0.5.0" [features] @@ -340,10 +349,10 @@ index b397dcf..2022a87 100644 - -[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 +Index: rust/vendor/io-close/Cargo.toml +=================================================================== +--- rust.orig/vendor/io-close/Cargo.toml ++++ rust/vendor/io-close/Cargo.toml @@ -28,6 +28,3 @@ optional = true version = "3.1.0" [target."cfg(unix)".dependencies.libc] @@ -351,10 +360,10 @@ index 5e36444..82f9ce5 100644 -[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 ef92ff0..c2733fb 100644 ---- a/vendor/io-lifetimes/Cargo.toml -+++ b/vendor/io-lifetimes/Cargo.toml +Index: rust/vendor/io-lifetimes/Cargo.toml +=================================================================== +--- rust.orig/vendor/io-lifetimes/Cargo.toml ++++ rust/vendor/io-lifetimes/Cargo.toml @@ -43,7 +43,6 @@ optional = true close = [ "libc", @@ -379,10 +388,10 @@ index ef92ff0..c2733fb 100644 - "Win32_System_Threading", -] -optional = true -diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml -index e0baea0..7790abd 100644 ---- a/vendor/is-terminal/Cargo.toml -+++ b/vendor/is-terminal/Cargo.toml +Index: rust/vendor/is-terminal/Cargo.toml +=================================================================== +--- rust.orig/vendor/is-terminal/Cargo.toml ++++ rust/vendor/is-terminal/Cargo.toml @@ -54,14 +54,3 @@ features = ["stdio"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] @@ -398,26 +407,41 @@ index e0baea0..7790abd 100644 - -[target."cfg(windows)".dev-dependencies.tempfile] -version = "3" -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" - +Index: rust/vendor/libloading-0.7.4/Cargo.toml +=================================================================== +--- rust.orig/vendor/libloading-0.7.4/Cargo.toml ++++ rust/vendor/libloading-0.7.4/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", -] -diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml -index 45f4a71..f791ce9 100644 ---- a/vendor/libssh2-sys/Cargo.toml -+++ b/vendor/libssh2-sys/Cargo.toml -@@ -43,7 +43,6 @@ version = "1.0.25" +Index: rust/vendor/libloading/Cargo.toml +=================================================================== +--- rust.orig/vendor/libloading/Cargo.toml ++++ rust/vendor/libloading/Cargo.toml +@@ -42,11 +42,3 @@ version = "1.1" + + [target."cfg(unix)".dependencies.cfg-if] + version = "1" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +- "Win32_System_LibraryLoader", +-] +Index: rust/vendor/libssh2-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/libssh2-sys/Cargo.toml ++++ rust/vendor/libssh2-sys/Cargo.toml +@@ -43,16 +43,8 @@ version = "1.0.25" version = "0.3.11" [features] @@ -425,18 +449,67 @@ index 45f4a71..f791ce9 100644 vendored-openssl = ["openssl-sys/vendored"] zlib-ng-compat = ["libz-sys/zlib-ng"] -@@ -52,7 +51,3 @@ version = "0.2" - +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- [target."cfg(unix)".dependencies.openssl-sys] version = "0.9.35" - -[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 +Index: rust/vendor/libz-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/libz-sys/Cargo.toml ++++ rust/vendor/libz-sys/Cargo.toml +@@ -65,6 +65,3 @@ zlib-ng = [ + "libc", + "cmake", + ] +- +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +Index: rust/vendor/mio/Cargo.toml +=================================================================== +--- rust.orig/vendor/mio/Cargo.toml ++++ rust/vendor/mio/Cargo.toml +@@ -102,8 +102,6 @@ default = ["log"] + net = [] + os-ext = [ + "os-poll", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_Security", + ] + os-poll = [] + +@@ -116,12 +114,3 @@ version = "0.11.0" + [target."cfg(unix)".dependencies.libc] + version = "0.2.121" + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +- "Win32_System_WindowsProgramming", +-] +Index: rust/vendor/native-tls/Cargo.toml +=================================================================== +--- rust.orig/vendor/native-tls/Cargo.toml ++++ rust/vendor/native-tls/Cargo.toml +@@ -61,6 +61,3 @@ version = "0.1" + + [target."cfg(not(any(target_os = \"windows\", target_os = \"macos\", target_os = \"ios\")))".dependencies.openssl-sys] + version = "0.9.55" +- +-[target."cfg(target_os = \"windows\")".dependencies.schannel] +-version = "0.1.17" +Index: rust/vendor/nu-ansi-term/Cargo.toml +=================================================================== +--- rust.orig/vendor/nu-ansi-term/Cargo.toml ++++ rust/vendor/nu-ansi-term/Cargo.toml @@ -45,13 +45,3 @@ version = "1.0.39" [features] @@ -451,10 +524,10 @@ index 209e055..aa40f02 100644 - "handleapi", - "processenv", -] -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 +Index: rust/vendor/opener-0.5.2/Cargo.toml +=================================================================== +--- rust.orig/vendor/opener-0.5.2/Cargo.toml ++++ rust/vendor/opener-0.5.2/Cargo.toml @@ -32,10 +32,6 @@ version = "0.9" [target."cfg(target_os = \"linux\")".dependencies.bstr] version = "1" @@ -466,10 +539,48 @@ index 8d91b5e..2d7313b 100644 [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -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 +Index: rust/vendor/opener/Cargo.toml +=================================================================== +--- rust.orig/vendor/opener/Cargo.toml ++++ rust/vendor/opener/Cargo.toml +@@ -40,8 +40,6 @@ version = "0.9" + reveal = [ + "dep:url", + "dep:dbus", +- "winapi/shtypes", +- "winapi/objbase", + ] + + [target."cfg(target_os = \"linux\")".dependencies.bstr] +@@ -56,13 +54,6 @@ optional = true + version = "2" + optional = true + +-[target."cfg(windows)".dependencies.normpath] +-version = "1" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["shellapi"] +- + [badges.appveyor] + branch = "master" + repository = "Seeker14491/opener" +Index: rust/vendor/openssl-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/openssl-sys/Cargo.toml ++++ rust/vendor/openssl-sys/Cargo.toml +@@ -56,6 +56,3 @@ version = "0.3.9" + [features] + unstable_boringssl = ["bssl-sys"] + vendored = ["openssl-src"] +- +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2.8" +Index: rust/vendor/os_info/Cargo.toml +=================================================================== +--- rust.orig/vendor/os_info/Cargo.toml ++++ rust/vendor/os_info/Cargo.toml @@ -48,18 +48,3 @@ version = "1" [features] @@ -489,10 +600,10 @@ index 52a062f..e1f347b 100644 - "winerror", - "winreg", -] -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 +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 @@ -60,15 +60,3 @@ version = "0.2.8" [target."cfg(unix)".dependencies.libc] @@ -509,10 +620,10 @@ index 6981516..9fb8bd2 100644 - "errhandlingapi", - "handleapi", -] -diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml -index d76740d..7da23fc 100644 ---- a/vendor/parking_lot_core/Cargo.toml -+++ b/vendor/parking_lot_core/Cargo.toml +Index: rust/vendor/parking_lot_core/Cargo.toml +=================================================================== +--- rust.orig/vendor/parking_lot_core/Cargo.toml ++++ rust/vendor/parking_lot_core/Cargo.toml @@ -57,6 +57,3 @@ version = "0.3" [target."cfg(unix)".dependencies.libc] @@ -520,44 +631,22 @@ index d76740d..7da23fc 100644 - -[target."cfg(windows)".dependencies.windows-targets] -version = "0.48.0" -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" -diff --git a/vendor/rustix-0.37.11/Cargo.toml b/vendor/rustix-0.37.11/Cargo.toml -index a0ea91d..e5d57b1 100644 ---- a/vendor/rustix-0.37.11/Cargo.toml -+++ b/vendor/rustix-0.37.11/Cargo.toml -@@ -234,14 +234,3 @@ package = "errno" - version = "1.5.2" - optional = true +Index: rust/vendor/reqwest/Cargo.toml +=================================================================== +--- rust.orig/vendor/reqwest/Cargo.toml ++++ rust/vendor/reqwest/Cargo.toml +@@ -443,6 +443,3 @@ features = ["serde-serialize"] --[target."cfg(windows)".dependencies.windows-sys] --version = "0.48.0" --features = [ -- "Win32_Foundation", -- "Win32_Networking_WinSock", -- "Win32_NetworkManagement_IpHelper", -- "Win32_System_Threading", --] + [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] + version = "0.3" - --[target."cfg(windows)".dev-dependencies.ctor] --version = "0.2.0" -diff --git a/vendor/rustix-0.37.20/Cargo.toml b/vendor/rustix-0.37.20/Cargo.toml -index 1a23dff..666da7b 100644 ---- a/vendor/rustix-0.37.20/Cargo.toml -+++ b/vendor/rustix-0.37.20/Cargo.toml -@@ -240,19 +240,3 @@ package = "errno" +-[target."cfg(windows)".dependencies.winreg] +-version = "0.10" +Index: rust/vendor/rustix-0.37.22/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix-0.37.22/Cargo.toml ++++ rust/vendor/rustix-0.37.22/Cargo.toml +@@ -239,19 +239,3 @@ package = "errno" version = "1.5.2" optional = true @@ -577,11 +666,11 @@ index 1a23dff..666da7b 100644 - -[target."cfg(windows)".dev-dependencies.ctor] -version = "0.2.0" -diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml -index dd40b25..95b35ba 100644 ---- a/vendor/rustix/Cargo.toml -+++ b/vendor/rustix/Cargo.toml -@@ -235,20 +235,3 @@ package = "errno" +Index: rust/vendor/rustix/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix/Cargo.toml ++++ rust/vendor/rustix/Cargo.toml +@@ -238,20 +238,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -602,20 +691,20 @@ index dd40b25..95b35ba 100644 - -[target."cfg(windows)".dev-dependencies.ctor] -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 +Index: rust/vendor/same-file/Cargo.toml +=================================================================== +--- rust.orig/vendor/same-file/Cargo.toml ++++ rust/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" -diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml -index 5ca8579..8f438dd 100644 ---- a/vendor/snapbox/Cargo.toml -+++ b/vendor/snapbox/Cargo.toml +Index: rust/vendor/snapbox/Cargo.toml +=================================================================== +--- rust.orig/vendor/snapbox/Cargo.toml ++++ rust/vendor/snapbox/Cargo.toml @@ -161,7 +161,6 @@ cmd = [ "dep:os_pipe", "dep:wait-timeout", @@ -633,10 +722,10 @@ index 5ca8579..8f438dd 100644 -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 +Index: rust/vendor/socket2/Cargo.toml +=================================================================== +--- rust.orig/vendor/socket2/Cargo.toml ++++ rust/vendor/socket2/Cargo.toml @@ -58,11 +58,3 @@ all = [] [target."cfg(unix)".dependencies.libc] @@ -649,10 +738,10 @@ index 3f1578c..bdac898 100644 - "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 +Index: rust/vendor/stacker/Cargo.toml +=================================================================== +--- rust.orig/vendor/stacker/Cargo.toml ++++ rust/vendor/stacker/Cargo.toml @@ -43,13 +43,3 @@ version = "0.1.7" [build-dependencies.cc] @@ -667,10 +756,10 @@ index 160cbc0..ba02aac 100644 - "processthreadsapi", - "minwindef", -] -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 +Index: rust/vendor/sysinfo-0.26.7/Cargo.toml +=================================================================== +--- rust.orig/vendor/sysinfo-0.26.7/Cargo.toml ++++ rust/vendor/sysinfo-0.26.7/Cargo.toml @@ -60,41 +60,3 @@ version = "1.0" [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] @@ -713,11 +802,60 @@ index f8719a4..deb2e40 100644 - "shellapi", - "std", -] -diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml -index 1af1206..f665e00 100644 ---- a/vendor/tempfile/Cargo.toml -+++ b/vendor/tempfile/Cargo.toml -@@ -53,10 +53,3 @@ features = ["fs"] +Index: rust/vendor/sysinfo/Cargo.toml +=================================================================== +--- rust.orig/vendor/sysinfo/Cargo.toml ++++ rust/vendor/sysinfo/Cargo.toml +@@ -75,44 +75,3 @@ version = "1.0" + + [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] + version = "^0.2.144" +- +-[target."cfg(windows)".dependencies.ntapi] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "errhandlingapi", +- "fileapi", +- "handleapi", +- "heapapi", +- "ifdef", +- "ioapiset", +- "minwindef", +- "pdh", +- "psapi", +- "synchapi", +- "sysinfoapi", +- "winbase", +- "winerror", +- "winioctl", +- "winnt", +- "oleauto", +- "wbemcli", +- "rpcdce", +- "combaseapi", +- "objidl", +- "powerbase", +- "netioapi", +- "lmcons", +- "lmaccess", +- "lmapibuf", +- "memoryapi", +- "ntlsa", +- "securitybaseapi", +- "shellapi", +- "std", +- "iphlpapi", +- "winsock2", +- "sddl", +-] +Index: rust/vendor/tempfile/Cargo.toml +=================================================================== +--- rust.orig/vendor/tempfile/Cargo.toml ++++ rust/vendor/tempfile/Cargo.toml +@@ -50,10 +50,3 @@ features = ["fs"] [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] version = "0.3" @@ -728,10 +866,10 @@ index 1af1206..f665e00 100644 - "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 +Index: rust/vendor/term/Cargo.toml +=================================================================== +--- rust.orig/vendor/term/Cargo.toml ++++ rust/vendor/term/Cargo.toml @@ -28,12 +28,6 @@ version = "2" [features] @@ -745,10 +883,10 @@ index e89261e..ad5d62b 100644 [badges.appveyor] repository = "Stebalien/term" -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 +Index: rust/vendor/termcolor/Cargo.toml +=================================================================== +--- rust.orig/vendor/termcolor/Cargo.toml ++++ rust/vendor/termcolor/Cargo.toml @@ -35,6 +35,3 @@ name = "termcolor" bench = false @@ -756,11 +894,11 @@ index dbdb6e8..8edc73e 100644 - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.3" -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" +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.37.0" features = ["termios"] @@ -771,10 +909,10 @@ index 9f31164..6d2d6a5 100644 - "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 +Index: rust/vendor/termize/Cargo.toml +=================================================================== +--- rust.orig/vendor/termize/Cargo.toml ++++ rust/vendor/termize/Cargo.toml @@ -49,8 +49,5 @@ rpath = false [dependencies] [target."cfg(unix)".dependencies.libc] @@ -784,10 +922,10 @@ index d248f4d..9bd9f37 100644 -features = ["handleapi", "processenv", "wincon", "winbase"] [badges.cirrus-ci] repository = "JohnTitor/termize" -diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml -index da1e4d1..55afa86 100644 ---- a/vendor/tokio/Cargo.toml -+++ b/vendor/tokio/Cargo.toml +Index: rust/vendor/tokio/Cargo.toml +=================================================================== +--- rust.orig/vendor/tokio/Cargo.toml ++++ rust/vendor/tokio/Cargo.toml @@ -122,11 +122,6 @@ net = [ "mio/os-ext", "mio/net", @@ -834,10 +972,10 @@ index da1e4d1..55afa86 100644 - "Win32_Foundation", - "Win32_Security_Authorization", -] -diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml -index b806036..4094678 100644 ---- a/vendor/uuid/Cargo.toml -+++ b/vendor/uuid/Cargo.toml +Index: rust/vendor/uuid/Cargo.toml +=================================================================== +--- rust.orig/vendor/uuid/Cargo.toml ++++ rust/vendor/uuid/Cargo.toml @@ -185,10 +185,6 @@ version = "0.3" version = "0.2" package = "wasm-bindgen" @@ -849,10 +987,10 @@ index b806036..4094678 100644 [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 +Index: rust/vendor/walkdir/Cargo.toml +=================================================================== +--- rust.orig/vendor/walkdir/Cargo.toml ++++ rust/vendor/walkdir/Cargo.toml @@ -39,9 +39,6 @@ version = "1.0.1" [dev-dependencies.doc-comment] version = "0.3" @@ -863,10 +1001,10 @@ index 7db9263..2a9b56f 100644 [badges.appveyor] repository = "BurntSushi/walkdir" -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 +Index: rust/vendor/yansi-term/Cargo.toml +=================================================================== +--- rust.orig/vendor/yansi-term/Cargo.toml ++++ rust/vendor/yansi-term/Cargo.toml @@ -36,9 +36,6 @@ version = "1.0" [features] diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index dadecf9d0..906f341ad 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -75,10 +75,10 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md +[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 +-[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-workspace -[`resolver` field]: ../../cargo/reference/resolver.html#resolver-versions +[workspace]: ../../../../cargo/book/reference/workspaces.html -+[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-manifest ++[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-workspace +[`resolver` field]: ../../../../cargo/book/reference/resolver.html#resolver-versions ## Migration diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch index e989666a1..39f246be1 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -12,12 +12,12 @@ Index: rust/src/bootstrap/lib.rs =================================================================== --- rust.orig/src/bootstrap/lib.rs +++ rust/src/bootstrap/lib.rs -@@ -1110,10 +1110,9 @@ impl Build { +@@ -1145,10 +1145,9 @@ impl Build { match which { GitRepo::Rustc => { - let sha = self.rust_sha().unwrap_or(&self.version); -- Some(format!("/rustc/{}", sha)) +- Some(format!("/rustc/{sha}")) + Some(format!("/usr/src/rustc-{}", &self.version)) } - GitRepo::Llvm => Some(String::from("/rustc/llvm")), diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index 3431ebfff..059a52078 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -3,16 +3,16 @@ Always enable cc even if the feature is not enabled. Some Debian architectures need outline asm, and Debian does not ship pre-built outline asm. -Index: rust/vendor/rustix/build.rs +Index: rust/vendor/rustix-0.37.22/build.rs =================================================================== ---- rust.orig/vendor/rustix/build.rs -+++ rust/vendor/rustix/build.rs +--- rust.orig/vendor/rustix-0.37.22/build.rs ++++ rust/vendor/rustix-0.37.22/build.rs @@ -1,4 +1,3 @@ -#[cfg(feature = "cc")] use cc::Build; use std::env::var; use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, +@@ -169,16 +168,16 @@ fn link_in_librustix_outline(arch: &str, println!("cargo:rerun-if-changed={}", to); // If "cc" is not enabled, use a pre-built library. @@ -32,93 +32,11 @@ Index: rust/vendor/rustix/build.rs { let out_dir = var("OUT_DIR").unwrap(); // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix/Cargo.toml +Index: rust/vendor/rustix-0.37.22/Cargo.toml =================================================================== ---- rust.orig/vendor/rustix/Cargo.toml -+++ rust/vendor/rustix/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" - - [build-dependencies.cc] - version = "1.0.68" --optional = true - - [features] - all-apis = [ -Index: rust/vendor/rustix-0.37.11/build.rs -=================================================================== ---- rust.orig/vendor/rustix-0.37.11/build.rs -+++ rust/vendor/rustix-0.37.11/build.rs -@@ -1,4 +1,3 @@ --#[cfg(feature = "cc")] - use cc::Build; - use std::env::var; - use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, - println!("cargo:rerun-if-changed={}", to); - - // If "cc" is not enabled, use a pre-built library. -- #[cfg(not(feature = "cc"))] -+ /*#[cfg(not(feature = "cc"))] - { - let _ = asm_name; - println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); - println!("cargo:rustc-link-lib=static={}", name); -- } -+ }*/ - - // If "cc" is enabled, build the library from source, update the pre-built - // version, and assert that the pre-built version is checked in. -- #[cfg(feature = "cc")] -+ //#[cfg(feature = "cc")] - { - let out_dir = var("OUT_DIR").unwrap(); - // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix-0.37.11/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.11/Cargo.toml -+++ rust/vendor/rustix-0.37.11/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" - - [build-dependencies.cc] - version = "1.0.68" --optional = true - - [features] - all-apis = [ -Index: rust/vendor/rustix-0.37.20/build.rs -=================================================================== ---- rust.orig/vendor/rustix-0.37.20/build.rs -+++ rust/vendor/rustix-0.37.20/build.rs -@@ -1,4 +1,3 @@ --#[cfg(feature = "cc")] - use cc::Build; - use std::env::var; - use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, - println!("cargo:rerun-if-changed={}", to); - - // If "cc" is not enabled, use a pre-built library. -- #[cfg(not(feature = "cc"))] -+ /*#[cfg(not(feature = "cc"))] - { - let _ = asm_name; - println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); - println!("cargo:rustc-link-lib=static={}", name); -- } -+ }*/ - - // If "cc" is enabled, build the library from source, update the pre-built - // version, and assert that the pre-built version is checked in. -- #[cfg(feature = "cc")] -+ //#[cfg(feature = "cc")] - { - let out_dir = var("OUT_DIR").unwrap(); - // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix-0.37.20/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.20/Cargo.toml -+++ rust/vendor/rustix-0.37.20/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" +--- rust.orig/vendor/rustix-0.37.22/Cargo.toml ++++ rust/vendor/rustix-0.37.22/Cargo.toml +@@ -127,7 +127,6 @@ version = "3.4.0" [build-dependencies.cc] version = "1.0.68" diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths index dddbec175..02935200e 100644 --- a/debian/patches/d-rust-lldb-paths +++ b/debian/patches/d-rust-lldb-paths @@ -23,7 +23,7 @@ Index: rust/src/etc/rust-lldb RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" -lldb=lldb -+lldb=lldb-16 ++lldb=lldb-17 if [ -f "$RUST_LLDB" ]; then lldb="$RUST_LLDB" else diff --git a/debian/patches/series b/debian/patches/series index 006ad623d..0c5160fa2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,7 +14,6 @@ u-ignore-endian-big-diff.patch 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 diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch deleted file mode 100644 index e7c1a3ced..000000000 --- a/debian/patches/u-profiler.patch +++ /dev/null @@ -1,139 +0,0 @@ -From d0b58f40a0e669897fafb614299d2a989997eda7 Mon Sep 17 00:00:00 2001 -From: Josh Stone <jistone@redhat.com> -Date: Tue, 25 Jul 2023 13:11:50 -0700 -Subject: [PATCH] Allow using external builds of the compiler-rt profile lib - -This changes the bootstrap config `target.*.profiler` from a plain bool -to also allow a string, which will be used as a path to the pre-built -profiling runtime for that target. Then `profiler_builtins/build.rs` -reads that in a `LLVM_PROFILER_RT_LIB` environment variable. ---- - config.example.toml | 6 ++++-- - library/profiler_builtins/build.rs | 6 ++++++ - src/bootstrap/compile.rs | 4 ++++ - src/bootstrap/config.rs | 30 ++++++++++++++++++++++++------ - 4 files changed, 38 insertions(+), 8 deletions(-) - -Index: rust/config.example.toml -=================================================================== ---- rust.orig/config.example.toml -+++ rust/config.example.toml -@@ -752,8 +752,10 @@ changelog-seen = 2 - # This option will override the same option under [build] section. - #sanitizers = build.sanitizers (bool) - --# Build the profiler runtime for this target(required when compiling with options that depend --# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`). -+# When true, build the profiler runtime for this target(required when compiling -+# with options that depend on this runtime, such as `-C profile-generate` or -+# `-C instrument-coverage`). This may also be given a path to an existing build -+# of the profiling runtime library from LLVM's compiler-rt. - # This option will override the same option under [build] section. - #profiler = build.profiler (bool) - -Index: rust/library/profiler_builtins/build.rs -=================================================================== ---- rust.orig/library/profiler_builtins/build.rs -+++ rust/library/profiler_builtins/build.rs -@@ -6,6 +6,12 @@ use std::env; - use std::path::Path; - - fn main() { -+ println!("cargo:rerun-if-env-changed=LLVM_PROFILER_RT_LIB"); -+ if let Ok(rt) = env::var("LLVM_PROFILER_RT_LIB") { -+ println!("cargo:rustc-link-lib=static:+verbatim={rt}"); -+ return; -+ } -+ - let target = env::var("TARGET").expect("TARGET was not set"); - let cfg = &mut cc::Build::new(); - -Index: rust/src/bootstrap/compile.rs -=================================================================== ---- rust.orig/src/bootstrap/compile.rs -+++ rust/src/bootstrap/compile.rs -@@ -336,6 +336,10 @@ pub fn std_cargo(builder: &Builder<'_>, - cargo.env("MACOSX_DEPLOYMENT_TARGET", target); - } - -+ if let Some(path) = builder.config.profiler_path(target) { -+ cargo.env("LLVM_PROFILER_RT_LIB", path); -+ } -+ - // Determine if we're going to compile in optimized C intrinsics to - // the `compiler-builtins` crate. These intrinsics live in LLVM's - // `compiler-rt` repository, but our `src/llvm-project` submodule isn't -Index: rust/src/bootstrap/config.rs -=================================================================== ---- rust.orig/src/bootstrap/config.rs -+++ rust/src/bootstrap/config.rs -@@ -533,7 +533,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>, -@@ -862,9 +862,9 @@ define_config! { - } - } - --#[derive(Debug, Deserialize)] -+#[derive(Clone, Debug, Deserialize)] - #[serde(untagged)] --enum StringOrBool { -+pub enum StringOrBool { - String(String), - Bool(bool), - } -@@ -976,6 +976,12 @@ define_config! { - } - } - -+impl StringOrBool { -+ fn is_string_or_true(&self) -> bool { -+ matches!(self, Self::String(_) | Self::Bool(true)) -+ } -+} -+ - define_config! { - /// TOML representation of how each build target is configured. - struct TomlTarget { -@@ -991,7 +997,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", -@@ -1887,12 +1893,24 @@ impl Config { - self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers - } - -+ pub fn profiler_path(&self, target: TargetSelection) -> Option<&str> { -+ match self.target_config.get(&target)?.profiler.as_ref()? { -+ StringOrBool::String(s) => Some(s), -+ StringOrBool::Bool(_) => None, -+ } -+ } -+ - pub fn profiler_enabled(&self, target: TargetSelection) -> bool { -- self.target_config.get(&target).map(|t| t.profiler).flatten().unwrap_or(self.profiler) -+ self.target_config -+ .get(&target) -+ .and_then(|t| t.profiler.as_ref()) -+ .map(StringOrBool::is_string_or_true) -+ .unwrap_or(self.profiler) - } - - pub fn any_profiler_enabled(&self) -> bool { -- self.target_config.values().any(|t| t.profiler == Some(true)) || self.profiler -+ self.target_config.values().any(|t| matches!(&t.profiler, Some(p) if p.is_string_or_true())) -+ || self.profiler - } - - pub fn rpath_enabled(&self, target: TargetSelection) -> bool { diff --git a/debian/rules b/debian/rules index eb6a2a4d1..940623614 100755 --- a/debian/rules +++ b/debian/rules @@ -34,8 +34,8 @@ export RUST_LONG_VERSION DEB_DESTDIR := $(CURDIR)/debian/tmp # Use system LLVM (comment out to use vendored LLVM) -LLVM_VERSION = 16 -OLD_LLVM_VERSION = 15 +LLVM_VERSION = 17 +OLD_LLVM_VERSION = 16 # Cargo-specific flags export LIBSSH2_SYS_USE_PKG_CONFIG=1 # Make it easier to test against a custom LLVM diff --git a/debian/rust-lldb.links b/debian/rust-lldb.links index e82fca912..444f6fc87 100644 --- a/debian/rust-lldb.links +++ b/debian/rust-lldb.links @@ -1 +1 @@ -usr/share/man/man1/lldb-16.1.gz usr/share/man/man1/rust-lldb.1.gz +usr/share/man/man1/lldb-17.1.gz usr/share/man/man1/rust-lldb.1.gz diff --git a/debian/rust-llvm.links b/debian/rust-llvm.links index 7090a480d..5796ed868 100644 --- a/debian/rust-llvm.links +++ b/debian/rust-llvm.links @@ -1,9 +1,9 @@ -usr/bin/lld-16 usr/bin/rust-lld -usr/bin/clang-16 usr/bin/rust-clang -usr/bin/llvm-dwp-16 usr/bin/rust-llvm-dwp +usr/bin/lld-17 usr/bin/rust-lld +usr/bin/clang-17 usr/bin/rust-clang +usr/bin/llvm-dwp-17 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 +usr/bin/llvm-profdata-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata +usr/bin/llvm-cov-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 02e7eb046..121a8b4da 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -6,8 +6,6 @@ rustc source: source-is-missing [tests/rustdoc/notable-trait/doc-notable_trait*. rustc source: source-is-missing [tests/rustdoc/notable-trait/spotlight*.html] rustc source: source-is-missing [vendor/html5ever/data/bench/*.html] rustc source: source-is-missing [vendor/minifier/tests/files/minified_main.js] -rustc source: source-contains-prebuilt-windows-binary [vendor/libloading/tests/nagisa32.dll] -rustc source: source-contains-prebuilt-windows-binary [vendor/libloading/tests/nagisa64.dll] # debian policy bug #649530, old and new formats rustc source: mismatched-override missing-license-paragraph-in-dep5-copyright mpl-2.0+ (*) diff --git a/debian/update-version.sh b/debian/update-version.sh index 491e1bbb0..1d510ab36 100755 --- a/debian/update-version.sh +++ b/debian/update-version.sh @@ -42,6 +42,7 @@ fi if [ "$NEW" != "$ORIG" ]; then git mv libstd-rust-$ORIG.install libstd-rust-$NEW.install +git mv libstd-rust-$ORIG.triggers libstd-rust-$NEW.triggers git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides fi sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index 821c42087..df9bff01a 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -47,6 +47,7 @@ src/doc/embedded-book/src/*/*.md src/doc/nomicon/src/intro.md src/doc/reference/src/expressions/closure-expr.md src/doc/reference/src/inline-assembly.md +src/doc/reference/src/unsafe-keyword.md src/doc/rust-by-example/src/flow_control/if_let.md src/doc/rust-by-example/src/std/arc.md src/doc/rust-by-example/src/trait/dyn.md @@ -58,6 +59,7 @@ src/doc/rustc/src/lints/groups.md src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md +src/doc/rustc/src/platform-support/wasm32-wasi-preview1-threads.md src/doc/rustc/src/targets/known-issues.md src/doc/rustdoc/src/*.md src/doc/style-guide/src/nightly.md @@ -69,6 +71,7 @@ src/librustdoc/html/static/scrape-examples-help.md src/tools/cargo/src/cargo/sources/git/known_hosts.rs src/tools/cargo/src/doc/src/guide/continuous-integration.md src/tools/cargo/src/doc/src/reference/features.md +src/tools/cargo/src/doc/src/reference/semver.md src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs src/tools/rust-analyzer/crates/ide-completion/src/completions/env_vars.rs src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs @@ -103,6 +106,8 @@ vendor/chrono/src/offset/local/tz_info/timezone.rs 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/encoding_rs/src/ascii.rs +vendor/encoding_rs/src/utf_16.rs vendor/fiat-crypto/src/secp256k1_dettman_64.rs vendor/git2/src/cred.rs vendor/half/LICENSES/Apache-2.0.txt @@ -110,6 +115,8 @@ vendor/half/LICENSES/MIT.txt vendor/handlebars/src/lib.rs vendor/handlebars/src/render.rs vendor/handlebars/src/template.rs +vendor/humansize/src/lib.rs +vendor/ipnet/RELEASES.md vendor/kstring/benches/clone.rs vendor/lazy_static/src/lib.rs vendor/maplit/README.rst @@ -130,7 +137,6 @@ 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/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 @@ -156,10 +162,12 @@ src/tools/rustdoc-js/tester.js vendor/libz-sys/src/smoke.c vendor/openssl-sys/build/expando.c vendor/signal-hook/src/low_level/extract.c +vendor/sysinfo-0.26.7/examples/simple.c vendor/wasm-bindgen-macro/src/worker.js vendor/wasm-bindgen/_package.json vendor/wasm-bindgen/examples/import_js/package.json vendor/wasm-bindgen/webdriver.json +vendor/wasm-bindgen-futures/src/task/worker.js # Embedded libraries, justified in README.source vendor/dlmalloc/src/dlmalloc.c @@ -275,6 +283,7 @@ 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/wasm-exceptions-nostd/verify.mjs 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 @@ -295,8 +304,6 @@ vendor/basic-toml/tests/valid/table-whitespace.toml vendor/bstr/src/unicode/fsm/*.dfa vendor/cargo_metadata*/tests/test_samples.rs 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 @@ -304,11 +311,12 @@ 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/encoding_rs/src/test_data/euc_kr_in.txt +vendor/encoding_rs/src/test_data/euc_kr_in_ref.txt vendor/flate2/examples/hello_world.txt.gz vendor/flate2/tests/*.gz vendor/flate2/tests/corrupt-gz-file.bin vendor/fluent-syntax/benches/parser.rs -vendor/gimli*/fixtures/self/* vendor/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz vendor/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz vendor/gsgdt/tests/*.json @@ -328,7 +336,6 @@ 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 -vendor/libloading/tests/*.dll vendor/litemap/benches/testdata/large_litemap.postcard vendor/lsp-types/tests/tsc-unix.lsif vendor/md-5/tests/data/*.blb @@ -364,21 +371,20 @@ 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 vendor/spki/tests/examples/*.der vendor/term/tests/data/* +vendor/tokio-native-tls/examples/identity.p12 +vendor/tokio-native-tls/tests/cert.der +vendor/tokio-native-tls/tests/identity.p12 +vendor/tokio-native-tls/tests/root-ca.der 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/* @@ -413,7 +419,7 @@ compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data src/librustdoc/html/static/fonts/*.woff2 # file brokenness (detected as Algol source code) -compiler/rustc_apfloat/src/lib.rs +compiler/rustc_builtin_macros/src/global_allocator.rs compiler/rustc_driver/src/lib.rs compiler/rustc_expand/src/mbe/quoted.rs compiler/rustc_macros/src/symbols/tests.rs @@ -434,8 +440,6 @@ src/tools/rustfmt/src/formatting.rs src/tools/rustfmt/src/lib.rs src/tools/rustfmt/src/parse/parser.rs src/tools/rustfmt/src/string.rs -vendor/ahash-0.7.6/src/hash_quality_test.rs -vendor/ahash-0.7.6/src/lib.rs vendor/ahash/src/fallback_hash.rs vendor/ahash/src/hash_quality_test.rs vendor/ahash/src/lib.rs @@ -452,14 +456,13 @@ vendor/base64ct/tests/*.rs vendor/bitflags/src/traits.rs vendor/block-buffer/tests/mod.rs vendor/camino/src/serde_impls.rs +vendor/ciborium/tests/codec.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/datafrog/src/lib.rs vendor/derive_more/src/*.rs vendor/digest/src/core_api/rt_variable.rs @@ -493,6 +496,7 @@ vendor/gix-protocol/src/fetch/delegate.rs vendor/gix-ref/src/store/packed/decode.rs vendor/gix-ref/src/store/packed/decode/tests.rs vendor/gix-revision/src/spec/parse/function.rs +vendor/humansize/src/allocating.rs vendor/icu_locid/tests/langid.rs vendor/icu_locid/tests/locale.rs vendor/indoc/src/lib.rs @@ -540,11 +544,11 @@ vendor/pulldown-cmark/tests/lib.rs vendor/rayon/tests/sort-panic-safe.rs vendor/regex-automata-0.1.10/src/regex.rs vendor/rustc-rayon/tests/sort-panic-safe.rs +vendor/rustc_apfloat/src/lib.rs vendor/rustversion/src/attr.rs vendor/rustversion/src/expand.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 @@ -564,11 +568,13 @@ vendor/syn*/src/stmt.rs vendor/syn*/src/token.rs vendor/syn*/src/ty.rs vendor/syn*/tests/test_meta.rs +vendor/thiserror-core-impl/src/attr.rs 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/document.rs vendor/toml_edit/src/parser/key.rs vendor/toml_edit/src/parser/mod.rs vendor/toml_edit/src/parser/numbers.rs @@ -584,6 +590,7 @@ 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/benches/number.rs vendor/winnow/examples/css/parser.rs vendor/winnow/examples/http/parser.rs vendor/winnow/examples/http/parser_streaming.rs @@ -593,15 +600,16 @@ vendor/winnow/examples/json/parser_partial.rs vendor/winnow/examples/ndjson/example.ndjson vendor/winnow/examples/ndjson/parser.rs vendor/winnow/src/ascii/mod.rs -vendor/winnow/src/binary/mod.rs vendor/winnow/src/binary/bits/mod.rs vendor/winnow/src/binary/bits/tests.rs +vendor/winnow/src/binary/mod.rs vendor/winnow/src/combinator/branch.rs vendor/winnow/src/combinator/core.rs vendor/winnow/src/combinator/parser.rs vendor/winnow/src/combinator/sequence.rs vendor/winnow/src/combinator/tests.rs vendor/winnow/src/error.rs +vendor/winnow/src/parser.rs vendor/winnow/src/token/mod.rs vendor/xz2/src/bufread.rs vendor/xz2/src/stream.rs @@ -611,3 +619,6 @@ vendor/yansi/src/tests.rs vendor/clap/examples/demo.md vendor/clap/examples/tutorial_builder/*.md vendor/clap/examples/tutorial_derive/*.md +vendor/clap-4.*/examples/demo.md +vendor/clap-4.*/examples/tutorial_builder/*.md +vendor/clap-4.*/examples/tutorial_derive/*.md |