diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:47 +0000 |
| commit | 8274ece7b836b5e6312e1aa97bebdf8c1f1cb464 (patch) | |
| tree | 20423151acc1cca6978e0d0cefe44638f26ad4b9 | |
| parent | Merging upstream version 1.75.0+dfsg1. (diff) | |
| download | rustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.tar.xz rustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.zip | |
Adding debian version 1.75.0+dfsg1-3.debian/1.75.0+dfsg1-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
32 files changed, 757 insertions, 752 deletions
diff --git a/debian/changelog b/debian/changelog index d54e5dae4..c576c6a21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +rustc (1.75.0+dfsg1-3) unstable; urgency=medium + + * d/rules: fix variable typo + * fix changelog + + -- Fabian Grünbichler <f.gruenbichler@proxmox.com> Thu, 06 Jun 2024 09:16:53 +0200 + +rustc (1.75.0+dfsg1-1) unstable; urgency=medium + + * d/rules: switch low-mem check to cover all 32-bits archs + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Thu, 06 Jun 2024 08:14:17 +0200 + +rustc (1.75.0+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release (Closes: #1068008) + * fix cross-building (thanks John Paul Adrian Glaubitz!) + + [ Samuel Thibault ] + * rules: Use 32bit limitations workaround on !linux as well + + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Tue, 04 Jun 2024 21:24:09 +0200 + rustc (1.74.1+dfsg1-1) unstable; urgency=medium * dwz: bump limit to avoid s390x build failures diff --git a/debian/control b/debian/control index c06ba0507..12aae0e57 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,19 @@ Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.17.14), python3:native, - cargo:native (>= 1.73.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (>= 1.73.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (<= 1.74.1++) <!pkg.rustc.dlstage0>, + cargo:native (>= 1.74.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (>= 1.74.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (<= 1.75.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>, libllvm17t64 (>= 1:17.0.0), libclang-rt-17-dev:native, + libclang-rt-17-dev, cmake (>= 3.0), # needed by some vendor crates + pkgconf:native, pkgconf, # this is sometimes needed by rustc_llvm zlib1g-dev:native, @@ -84,7 +86,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.74 +Package: libstd-rust-1.75 Section: libs Architecture: any Multi-Arch: same @@ -111,7 +113,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libstd-rust-1.74 (= ${binary:Version}), + libstd-rust-1.75 (= ${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 @@ -306,7 +308,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.74 (= ${binary:Version}) + libstd-rust-1.75 (= ${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 6e55fd7b9..5d33f9cb5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -42,7 +42,6 @@ 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 # test binary files vendor/libloading-0.7.4/tests/*.dll vendor/libloading/tests/*.dll @@ -55,37 +54,35 @@ Files-Excluded: # unused dependencies, generated by debian/prune-unused-deps # DO NOT EDIT below, AUTOGENERATED vendor/addr2line-0.19.0 + vendor/aes vendor/aho-corasick-0.7.18 - vendor/anstream-0.5.0 vendor/anstyle-1.0.0 - vendor/anstyle-1.0.1 vendor/anstyle-parse-0.2.0 vendor/anstyle-wincon-2.1.0 vendor/anstyle-wincon - vendor/anyhow-1.0.66 vendor/anyhow-1.0.71 vendor/anymap vendor/arbitrary vendor/backtrace-0.3.67 vendor/base64-0.21.2 vendor/bitflags-2.3.2 - vendor/bitflags-2.3.3 + vendor/bitflags-2.4.0 vendor/block-buffer-0.10.2 vendor/bstr-0.2.17 vendor/bstr-1.5.0 - vendor/bumpalo-3.11.1 + vendor/bumpalo-3.13.0 + vendor/cargo_metadata-0.18.0 vendor/cc-1.0.73 vendor/chalk-derive vendor/chalk-ir vendor/chalk-recursive vendor/chalk-solve - vendor/clap-4.2.4 + vendor/cipher vendor/clap-4.4.4 - vendor/clap_builder-4.2.4 vendor/clap_builder-4.4.4 - vendor/clap_complete-4.2.2 - vendor/clap_derive-4.2.0 - vendor/clap_lex-0.4.1 + vendor/clap_complete-4.3.1 + vendor/clap_derive-4.4.2 + vendor/clap_lex-0.5.0 vendor/command-group vendor/core-foundation-sys-0.8.3 vendor/cpufeatures-0.2.5 @@ -102,7 +99,6 @@ Files-Excluded: vendor/cranelift-module vendor/cranelift-native vendor/cranelift-object - vendor/crossbeam-channel-0.5.6 vendor/crossbeam-deque-0.8.2 vendor/crossbeam-epoch-0.9.13 vendor/crossbeam-utils-0.8.14 @@ -113,13 +109,14 @@ Files-Excluded: vendor/diff-0.1.12 vendor/digest-0.10.3 vendor/directories + vendor/dirs-sys vendor/dot vendor/either-1.6.1 vendor/encode_unicode vendor/encoding_rs-0.8.32 vendor/equivalent-1.0.0 - vendor/errno-0.3.0 - vendor/fallible-iterator-0.2.0 + vendor/errno-0.3.1 + vendor/errno-dragonfly vendor/filetime-0.2.16 vendor/filetime-0.2.21 vendor/fixedbitset @@ -127,37 +124,42 @@ Files-Excluded: vendor/fsevent-sys vendor/fst vendor/generic-array-0.14.5 - vendor/gimli-0.27.2 vendor/gimli-0.27.3 vendor/globset-0.4.10 vendor/globset-0.4.8 vendor/hashbrown-0.13.2 + vendor/hashbrown-0.14.0 vendor/heck-0.3.3 vendor/hermit-abi-0.2.6 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index + vendor/home-0.5.4 vendor/ignore-0.4.18 vendor/inotify vendor/inotify-sys + vendor/inout vendor/is-terminal-0.4.8 vendor/itoa-1.0.2 vendor/jemalloc-sys + vendor/jobserver-0.1.26 vendor/junction vendor/kqueue vendor/kqueue-sys - vendor/libc-0.2.138 - vendor/libc-0.2.140 vendor/libc-0.2.146 + vendor/libc-0.2.148 + vendor/libc-0.2.149 vendor/libffi vendor/libffi-sys + vendor/libloading-0.8.0 vendor/libmimalloc-sys vendor/libnghttp2-sys vendor/linked-hash-map - vendor/linux-raw-sys-0.4.5 vendor/log-0.4.17 + vendor/log-0.4.19 vendor/lzma-sys-0.1.17 vendor/mach vendor/memchr-2.5.0 + vendor/memchr-2.6.3 vendor/memoffset-0.7.1 vendor/mimalloc vendor/miniz_oxide-0.6.2 @@ -169,15 +171,14 @@ Files-Excluded: 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.4 vendor/once_cell-1.12.0 - vendor/once_cell-1.16.0 vendor/opener-0.5.0 vendor/openssl-0.10.55 vendor/openssl-src vendor/openssl-sys-0.9.90 + vendor/option-ext vendor/parking_lot_core-0.9.6 vendor/paste vendor/pest-2.6.0 @@ -197,15 +198,15 @@ Files-Excluded: vendor/quote-1.0.29 vendor/ra-ap-rustc_index vendor/ra-ap-rustc_parse_format - vendor/rayon-1.6.0 - vendor/rayon-core-1.10.1 + vendor/rayon-1.7.0 + vendor/rayon-core-1.11.0 vendor/redox_syscall-0.2.13 vendor/regalloc2 vendor/regex-1.5.6 vendor/regex-syntax-0.6.26 vendor/region vendor/rustc-build-sysroot - vendor/rustix-0.38.6 + vendor/rustix-0.38.19 vendor/ryu-1.0.10 vendor/salsa vendor/salsa-macros @@ -222,14 +223,21 @@ Files-Excluded: vendor/serde_json-1.0.81 vendor/serde_json-1.0.97 vendor/serde_json-1.0.99 + vendor/serde_spanned-0.6.3 + vendor/sha1-0.10.5 vendor/sha2-0.10.2 + vendor/sha2-0.10.7 vendor/slice-group-by vendor/smallvec-1.10.0 vendor/syn-2.0.18 + vendor/syn-2.0.29 vendor/syn-2.0.8 vendor/target-lexicon + vendor/tempfile-3.8.0 vendor/thiserror-1.0.40 + vendor/thiserror-1.0.47 vendor/thiserror-impl-1.0.40 + vendor/thiserror-impl-1.0.47 vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl @@ -238,45 +246,55 @@ Files-Excluded: vendor/time-core-0.1.1 vendor/time-macros-0.2.9 vendor/toml-0.5.9 - vendor/toml-0.7.5 - vendor/toml_edit-0.19.11 + vendor/toml_datetime-0.6.3 + vendor/tracing-attributes-0.1.26 + vendor/tracing-core-0.1.31 vendor/tracing-tree-0.2.3 vendor/typed-arena vendor/typenum-1.15.0 - vendor/ui_test vendor/unicase-2.6.0 vendor/unicode-ident-1.0.0 + vendor/unicode-width-0.1.10 vendor/url-2.4.0 vendor/walkdir-2.3.2 + vendor/walkdir-2.3.3 vendor/wasmtime-jit-icache-coherence vendor/web-sys-0.3.61 vendor/winapi vendor/winapi-i686-pc-windows-gnu vendor/winapi-util vendor/winapi-x86_64-pc-windows-gnu - vendor/windows-0.46.0 + vendor/windows-0.48.0 vendor/windows_aarch64_gnullvm-0.42.2 + vendor/windows_aarch64_gnullvm-0.48.0 vendor/windows_aarch64_gnullvm vendor/windows_aarch64_msvc-0.42.2 + vendor/windows_aarch64_msvc-0.48.0 vendor/windows_aarch64_msvc vendor/windows + vendor/windows-core vendor/windows_i686_gnu-0.42.2 + vendor/windows_i686_gnu-0.48.0 vendor/windows_i686_gnu vendor/windows_i686_msvc-0.42.2 + vendor/windows_i686_msvc-0.48.0 vendor/windows_i686_msvc vendor/windows-sys-0.42.0 vendor/windows-sys-0.45.0 vendor/windows-sys vendor/windows-targets-0.42.2 vendor/windows-targets-0.48.0 + vendor/windows-targets-0.48.1 vendor/windows-targets vendor/windows_x86_64_gnu-0.42.2 + vendor/windows_x86_64_gnu-0.48.0 vendor/windows_x86_64_gnu vendor/windows_x86_64_gnullvm-0.42.2 + vendor/windows_x86_64_gnullvm-0.48.0 vendor/windows_x86_64_gnullvm vendor/windows_x86_64_msvc-0.42.2 + vendor/windows_x86_64_msvc-0.48.0 vendor/windows_x86_64_msvc - vendor/winnow-0.4.7 vendor/winreg vendor/xz2-0.1.6 vendor/yaml-merge-keys @@ -359,6 +377,7 @@ Comment: see https://github.com/ogham/rust-ansi-term Files: vendor/anstream/* + vendor/anstream-0.*/* vendor/anstyle/* vendor/anstyle-parse/* vendor/anstyle-query/* @@ -662,11 +681,6 @@ Copyright: 2015-2023 Hyunsik Choi <hyunsik.choi@gmail.com> License: Apache-2.0 Comment: see https://github.com/hyunsik/bytesize/ -Files: vendor/byteyarn/* -Copyright: 2023-2024 Miguel Young de la Sota <mcyoung@mit.edu> -License: Apache-2.0 -Comment: see https://github.com/mcy/byteyarn - Files: vendor/globset/* vendor/ignore/* @@ -737,6 +751,11 @@ Copyright: 2015-2022 Kevin K. <kbknapp@gmail.com> License: MIT Comment: see https://github.com/clap-rs/clap +Files: vendor/clap-cargo/* +Copyright: 2019-2024 Ed Page <eopage@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/crate-ci/clap-cargo + Files: vendor/clru/* Copyright: 2020-2023 marmeladema <xademax@gmail.com> License: MIT @@ -868,6 +887,11 @@ Copyright: 2020-2023 Jacob Pratt <jacob@jhpratt.dev> License: MIT OR Apache-2.0 Comment: see https://github.com/jhpratt/deranged +Files: vendor/derivative/* +Copyright: 2016-2021 mcarton <cartonmartin+git@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/mcarton/rust-derivative + Files: vendor/derive_builder/* vendor/derive_builder_core/* @@ -917,6 +941,7 @@ Files: vendor/arrayvec/* vendor/either/* vendor/itertools/* + vendor/itertools-0.*/* vendor/maplit/* vendor/scopeguard/* Copyright: 2014-2020 bluss @@ -931,9 +956,9 @@ Comment: Files: vendor/dirs/* - vendor/dirs-sys/* -Copyright: 2015-2020 Simon Ochsenreither <simon@ochsenreither.de> - 2015-2020 dirs-rs contributors + vendor/dirs-sys-0.*/* +Copyright: 2015-2024 Simon Ochsenreither <simon@ochsenreither.de> + 2015-2024 dirs-rs contributors License: MIT OR Apache-2.0 Comment: see https://github.com/dirs-dev/dirs-rs @@ -996,11 +1021,6 @@ Copyright: 2015-2022 Chris Wong <lambda.fairy@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/lambda-fairy/rust-errno -Files: vendor/errno-dragonfly/* -Copyright: 2017-2021 Michael Neumann <mneumann@ntecs.de> -License: MIT -Comment: see https://github.com/mneumann/errno-dragonfly-rs - Files: vendor/equivalent/* Copyright: 2016-2023 Josh Stone <cuviper@gmail.com> License: Apache-2.0 OR MIT @@ -1140,6 +1160,7 @@ Files: vendor/gix-diff/* vendor/gix-discover/* vendor/gix-features/* + vendor/gix-features-0.*/* vendor/gix-filter/* vendor/gix-fs/* vendor/gix-glob/* @@ -1356,11 +1377,6 @@ Copyright: 2018-2021 Kekoa Riggin <kekoariggin@gmail.com> License: Apache-2.0 or MIT Comment: see https://github.com/zbraniecki/pluralrules -Files: vendor/io-lifetimes/* -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 @@ -1425,6 +1441,11 @@ Copyright: 2018-2021 Changseok Han <freestrings@gmail.com> License: MIT Comment: see https://github.com/freestrings/jsonpath +Files: vendor/kstring/* +Copyright: 2014-2024 Ed Page <eopage@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/cobalt-org/kstring + Files: vendor/la-arena/* Copyright: 2024 rust-analyzer team License: MIT or Apache-2.0 @@ -1461,9 +1482,7 @@ Copyright: 2015-2022 Simonas Kazlauskas <libloading@kazlauskas.me> License: ISC Comment: see https://github.com/nagisa/rust_libloading/ -Files: - vendor/libm/* - vendor/libm-0.*/* +Files: vendor/libm/* Copyright: 2018-2024 Jorge Aparicio <jorge@japaric.io> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang-nursery/libm @@ -1488,9 +1507,7 @@ Copyright: 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.*/* +Files: vendor/linux-raw-sys/* Copyright: 2021-2022 Dan Gohman <dev@sunfishcode.online> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT Comment: see https://github.com/sunfishcode/linux-raw-sys @@ -1713,16 +1730,22 @@ Comment: see https://github.com/Amanieu/thread_local-rs see https://github.com/Amanieu/parking_lot -Files: vendor/packed_simd_2/* -Copyright: 2018-2021 Gonzalo Brito Gadeschi <gonzalobg88@gmail.com> - 2018-2021 Jubilee Young <workingjubilee@gmail.com> -License: MIT or Apache-2.0 -Comment: see https://github.com/rust-lang-nursery/packed_simd +Files: vendor/packed_simd/* +Copyright: + 2018-2023 Gonzalo Brito Gadeschi <gonzalobg88@gmail.com> + 2014-2023 The Rust Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/packed_simd Files: vendor/pad/* Copyright: 2018-2024 Ben S <ogham@bsago.me> License: MIT +Files: vendor/papergrid/* +Copyright: 2020-2024 Maxim Zhiburt <zhiburt@gmail.com> +License: MIT +Comment: see https://github.com/zhiburt/tabled + Files: vendor/partial_ref/* vendor/partial_ref_derive/* @@ -1943,9 +1966,7 @@ Copyright: License: Apache-2.0 or MIT Comment: see https://github.com/killercup/rustfix -Files: - vendor/rustix/* - vendor/rustix-0.*/* +Files: vendor/rustix/* Copyright: 2020-2023 Dan Gohman <dev@sunfishcode.online> 2020-2023 Jakub Konka <kubkon@jakubkonka.com> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT @@ -2148,6 +2169,11 @@ Copyright: 2017-2023 Isis Lovecruft <isis@patternsinthevoid.net> License: BSD-3-Clause Comment: see https://github.com/dalek-cryptography/subtle +Files: vendor/supports-hyperlinks/* +Copyright: 2021-2024 Kat Marchán <kzm@zkat.tech> +License: Apache-2.0 +Comment: see https://github.com/zkat/supports-hyperlinks + Files: vendor/synstructure/* vendor/synstructure-0.*/* @@ -2163,6 +2189,11 @@ Copyright: 2015-2022 Guillaume Gomez <guillaume1.gomez@gmail.com> License: MIT Comment: see https://github.com/GuillaumeGomez/sysinfo +Files: vendor/tabled/* +Copyright: 2020-2024 Maxim Zhiburt <zhiburt@gmail.com> +License: MIT +Comment: see https://github.com/zhiburt/tabled + Files: vendor/tar-0.4.38/* Copyright: 2014-2023 Alex Crichton <alex@alexcrichton.com> License: MIT or Apache-2.0 @@ -2281,7 +2312,9 @@ Copyright: 2014-2024 Alex Crichton <alex@alexcrichton.com> License: MIT OR Apache-2.0 Comment: see https://github.com/toml-rs/toml -Files: vendor/toml_edit/* +Files: + vendor/toml_edit/* + vendor/toml_edit-0.*/* Copyright: 2014-2024 Andronik Ordian <write@reusable.software> 2014-2024 Ed Page <eopage@gmail.com> License: MIT OR Apache-2.0 @@ -2289,6 +2322,7 @@ Comment: see https://github.com/ordian/toml_edit Files: vendor/tracing/* + vendor/tracing-0.*/* vendor/tracing-attributes/* vendor/tracing-core/* vendor/tracing-core-0.*/* @@ -2335,7 +2369,7 @@ Copyright: 2015-2019 Paho Lurie-Gregg <paho@paholg.com> License: MIT or Apache-2.0 Comment: see https://github.com/paholg/typenum -Files: vendor/ui_test-0.*/* +Files: vendor/ui_test/* Copyright: 2010-2024 The Rust Project Developers 2015-2024 Thomas Bracht Laumann Jespersen <laumann.thomas@gmail.com> @@ -2417,11 +2451,6 @@ Copyright: 2014-2019 Sean McArthur <sean@seanmonstar.com> License: MIT or Apache-2.0 Comment: see https://github.com/seanmonstar/unicase -Files: vendor/unicode_categories/* -Copyright: 2015-2016 Sean Gillespie <sean@swgillespie.me> -License: MIT OR Apache-2.0 -Comment: see https://github.com/swgillespie/unicode-categories - Files: vendor/unic-*/* Copyright: 2017-2022 The UNIC Project Developers License: MIT or Apache-2.0 @@ -2503,7 +2532,9 @@ License: MIT or Apache-2.0 Comment: see https://github.com/microsoft/windows-rs -Files: vendor/winnow/* +Files: + vendor/winnow/* + vendor/winnow-0.*/* Copyright: 2023 winnow contributors 2014-2023 nom contributors @@ -2628,7 +2659,10 @@ Comment: see https://github.com/zip-rs/zip.git Files: vendor/icu_list/* + vendor/icu_list_data/* vendor/icu_locid/* + vendor/icu_locid_transform/* + vendor/icu_locid_transform_data/* vendor/icu_provider/* vendor/icu_provider_adapters/* vendor/icu_provider_macros/* diff --git a/debian/libstd-rust-1.74.lintian-overrides b/debian/libstd-rust-1.74.lintian-overrides deleted file mode 100644 index db96cfcf8..000000000 --- a/debian/libstd-rust-1.74.lintian-overrides +++ /dev/null @@ -1,16 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.74 binary: package-name-doesnt-match-sonames -libstd-rust-1.74 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.74 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.74 binary: shlib-without-versioned-soname -libstd-rust-1.74 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.74 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.74 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.74.install b/debian/libstd-rust-1.75.install index cd4545cca..cd4545cca 100644 --- a/debian/libstd-rust-1.74.install +++ b/debian/libstd-rust-1.75.install diff --git a/debian/libstd-rust-1.75.lintian-overrides b/debian/libstd-rust-1.75.lintian-overrides new file mode 100644 index 000000000..472af69f7 --- /dev/null +++ b/debian/libstd-rust-1.75.lintian-overrides @@ -0,0 +1,16 @@ +# "libstd" just seemed too generic +libstd-rust-1.75 binary: package-name-doesnt-match-sonames +libstd-rust-1.75 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.75 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.75 binary: shlib-without-versioned-soname +libstd-rust-1.75 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.75 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.75 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.74.triggers b/debian/libstd-rust-1.75.triggers index a88c20f92..a88c20f92 100644 --- a/debian/libstd-rust-1.74.triggers +++ b/debian/libstd-rust-1.75.triggers diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 2002ea30d..2ca3804d4 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -3,11 +3,11 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules --- - Cargo.toml | 7 ----- - src/bootstrap/bootstrap.py | 4 --- - src/bootstrap/builder.rs | 54 +++++++++----------------------------- - src/bootstrap/test.rs | 12 +-------- - src/tools/rust-analyzer/Cargo.toml | 11 +++++++- + Cargo.toml | 7 ---- + src/bootstrap/bootstrap.py | 4 --- + src/bootstrap/src/core/build_steps/test.rs | 12 +------ + src/bootstrap/src/core/builder.rs | 54 +++++++----------------------- + src/tools/rust-analyzer/Cargo.toml | 11 +++++- 5 files changed, 24 insertions(+), 64 deletions(-) diff --git a/Cargo.toml b/Cargo.toml @@ -38,10 +38,10 @@ index 9b11ae8..19a98f9 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index fac0cdf..6fa1e9e 100644 +index 5a84e37..9bb09a6 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -962,10 +962,6 @@ class RustBuild(object): +@@ -969,10 +969,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)) @@ -52,11 +52,34 @@ index fac0cdf..6fa1e9e 100644 if self.get_toml("metrics", "build"): args.append("--features") args.append("build-metrics") -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 46a62ee..216158c 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -499,20 +499,20 @@ impl<'a> ShouldRun<'a> { +diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs +index d2aa89d..1ea2d93 100644 +--- a/src/bootstrap/src/core/build_steps/test.rs ++++ b/src/bootstrap/src/core/build_steps/test.rs +@@ -2278,17 +2278,7 @@ impl Step for RustcGuide { + } + + fn run(self, builder: &Builder<'_>) { +- let relative_path = Path::new("src").join("doc").join("rustc-dev-guide"); +- builder.update_submodule(&relative_path); +- +- let src = builder.src.join(relative_path); +- let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); +- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) { +- ToolState::TestPass +- } else { +- ToolState::TestFail +- }; +- builder.save_toolstate("rustc-dev-guide", toolstate); ++ builder.save_toolstate("rustc-dev-guide", ToolState::TestPass); + } + } + +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index cd27667..2c870e9 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -498,20 +498,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +112,7 @@ index 46a62ee..216158c 100644 submodules_paths }; -@@ -686,25 +686,14 @@ impl<'a> Builder<'a> { +@@ -685,25 +685,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -115,7 +138,7 @@ index 46a62ee..216158c 100644 tool::OptimizedDist, tool::CoverageDump, ), -@@ -714,12 +703,7 @@ impl<'a> Builder<'a> { +@@ -713,12 +702,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -128,7 +151,7 @@ index 46a62ee..216158c 100644 check::Bootstrap ), Kind::Test => describe!( -@@ -750,7 +734,6 @@ impl<'a> Builder<'a> { +@@ -751,7 +735,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -136,7 +159,7 @@ index 46a62ee..216158c 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -766,7 +749,6 @@ impl<'a> Builder<'a> { +@@ -767,7 +750,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -144,7 +167,7 @@ index 46a62ee..216158c 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -803,7 +785,6 @@ impl<'a> Builder<'a> { +@@ -804,7 +786,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -152,7 +175,7 @@ index 46a62ee..216158c 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -821,12 +802,9 @@ impl<'a> Builder<'a> { +@@ -823,12 +804,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -165,7 +188,7 @@ index 46a62ee..216158c 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -843,11 +821,9 @@ impl<'a> Builder<'a> { +@@ -845,11 +823,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -177,7 +200,7 @@ index 46a62ee..216158c 100644 install::LlvmTools, install::Src, install::Rustc -@@ -857,7 +833,6 @@ impl<'a> Builder<'a> { +@@ -859,7 +835,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -185,7 +208,7 @@ index 46a62ee..216158c 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1998,10 +1973,7 @@ impl<'a> Builder<'a> { +@@ -2045,10 +2020,7 @@ impl<'a> Builder<'a> { } } @@ -197,29 +220,6 @@ index 46a62ee..216158c 100644 cargo.arg("--frozen"); } -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index ba030f0..ba2e669 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -2167,17 +2167,7 @@ impl Step for RustcGuide { - } - - fn run(self, builder: &Builder<'_>) { -- let relative_path = Path::new("src").join("doc").join("rustc-dev-guide"); -- builder.update_submodule(&relative_path); -- -- let src = builder.src.join(relative_path); -- let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); -- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) { -- ToolState::TestPass -- } else { -- ToolState::TestFail -- }; -- builder.save_toolstate("rustc-dev-guide", toolstate); -+ builder.save_toolstate("rustc-dev-guide", ToolState::TestPass); - } - } - diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml index cab88fc..5bac437 100644 --- a/src/tools/rust-analyzer/Cargo.toml diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index ea3975d6f..1ff501dc3 100644 --- a/debian/patches/d-0005-no-jemalloc.patch +++ b/debian/patches/d-0005-no-jemalloc.patch @@ -8,12 +8,12 @@ Subject: d-0005-no-jemalloc 2 files changed, 8 deletions(-) diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml -index dcb165f..e211d6f 100644 +index 3cb56a7..af37dfc 100644 --- a/compiler/rustc/Cargo.toml +++ b/compiler/rustc/Cargo.toml -@@ -15,13 +15,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } - rustc_smir = { path = "../rustc_smir" } +@@ -20,14 +20,8 @@ rustc_smir = { path = "../rustc_smir" } stable_mir = { path = "../stable_mir" } + # tidy-alphabetical-end -[dependencies.jemalloc-sys] -version = "0.5.0" @@ -21,6 +21,7 @@ index dcb165f..e211d6f 100644 -features = ['unprefixed_malloc_on_supported_platforms'] - [features] + # tidy-alphabetical-start -jemalloc = ['jemalloc-sys'] llvm = ['rustc_driver_impl/llvm'] max_level_info = ['rustc_driver_impl/max_level_info'] 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 cc0ab7881..0df7a9ec8 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -8,10 +8,10 @@ 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 4403044..23c5cc7 100644 +index 3fb36b4..c011909 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml -@@ -217,7 +217,5 @@ test = false +@@ -226,7 +226,5 @@ test = false doc = false [features] diff --git a/debian/patches/d-0012-cargo-always-return-dev-channel.patch b/debian/patches/d-0012-cargo-always-return-dev-channel.patch index 86e67ed75..2465a48cb 100644 --- a/debian/patches/d-0012-cargo-always-return-dev-channel.patch +++ b/debian/patches/d-0012-cargo-always-return-dev-channel.patch @@ -8,10 +8,10 @@ Last-Update: 2023-05-30 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs -index 5faa208..eefbf78 100644 +index 72a267f..032a1ef 100644 --- a/src/tools/cargo/src/cargo/core/features.rs +++ b/src/tools/cargo/src/cargo/core/features.rs -@@ -1212,9 +1212,8 @@ pub fn channel() -> String { +@@ -1192,9 +1192,8 @@ pub fn channel() -> String { return "dev".to_string(); } } diff --git a/debian/patches/d-0020-remove-windows-dependencies.patch b/debian/patches/d-0020-remove-windows-dependencies.patch index cc3514750..dd4f4d88d 100644 --- a/debian/patches/d-0020-remove-windows-dependencies.patch +++ b/debian/patches/d-0020-remove-windows-dependencies.patch @@ -4,30 +4,30 @@ Subject: d-0020-remove-windows-dependencies =================================================================== --- - compiler/rustc_codegen_ssa/Cargo.toml | 4 ---- - compiler/rustc_data_structures/Cargo.toml | 10 ---------- - compiler/rustc_driver_impl/Cargo.toml | 6 ------ - compiler/rustc_errors/Cargo.toml | 8 -------- - compiler/rustc_session/Cargo.toml | 7 ------- - library/backtrace/Cargo.toml | 13 ------------- - src/bootstrap/Cargo.toml | 15 --------------- - src/tools/cargo/Cargo.toml | 21 +++------------------ - .../cargo/crates/cargo-test-support/Cargo.toml | 3 --- - 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/cargo/src/cargo/util/auth/mod.rs | 2 -- - 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 ---- - 17 files changed, 3 insertions(+), 122 deletions(-) + compiler/rustc_codegen_ssa/Cargo.toml | 4 ---- + compiler/rustc_data_structures/Cargo.toml | 10 ---------- + compiler/rustc_driver_impl/Cargo.toml | 6 ------ + compiler/rustc_errors/Cargo.toml | 8 -------- + compiler/rustc_session/Cargo.toml | 7 ------- + library/backtrace/Cargo.toml | 13 ------------ + src/bootstrap/Cargo.toml | 15 -------------- + src/tools/cargo/Cargo.toml | 23 ++++------------------ + .../cargo/crates/cargo-test-support/Cargo.toml | 3 --- + 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/cargo/src/cargo/util/auth/mod.rs | 5 ----- + 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 ---- + 17 files changed, 4 insertions(+), 126 deletions(-) diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml -index 34d0e2d..2cb22f0 100644 +index 4dae49f..20453c2 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml -@@ -45,7 +45,3 @@ libc = "0.2.50" +@@ -49,7 +49,3 @@ libc = "0.2.50" version = "0.32.0" default-features = false features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"] @@ -36,10 +36,10 @@ index 34d0e2d..2cb22f0 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 f77bd53..a3d1810 100644 +index 8d91c4c..0de63d9 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml -@@ -37,16 +37,6 @@ itertools = "0.10.1" +@@ -32,16 +32,6 @@ tracing = "0.1" [dependencies.parking_lot] version = "0.12" @@ -54,15 +54,15 @@ index f77bd53..a3d1810 100644 -] - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] + # tidy-alphabetical-start memmap2 = "0.2.1" - diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml -index a7b0161..62c4249 100644 +index da7c244..80547ce 100644 --- a/compiler/rustc_driver_impl/Cargo.toml +++ b/compiler/rustc_driver_impl/Cargo.toml -@@ -57,12 +57,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" } - [target.'cfg(unix)'.dependencies] +@@ -58,12 +58,6 @@ tracing = { version = "0.1.35" } libc = "0.2" + # tidy-alphabetical-end -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -71,15 +71,15 @@ index a7b0161..62c4249 100644 -] - [features] + # tidy-alphabetical-start 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 faab9f0..3ea55cb 100644 +index fc3ff83..4f74aec 100644 --- a/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml -@@ -27,13 +27,5 @@ serde = { version = "1.0.125", features = [ "derive" ] } - serde_json = "1.0.59" - derive_setters = "0.1.6" +@@ -27,14 +27,6 @@ tracing = "0.1" + unicode-width = "0.1.4" + # tidy-alphabetical-end -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -90,15 +90,16 @@ index faab9f0..3ea55cb 100644 -] - [features] + # tidy-alphabetical-start 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 e26d25d..fe343f8 100644 +index 1f51dd6..2974bd0 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml -@@ -24,10 +24,3 @@ termize = "0.1.1" - - [target.'cfg(unix)'.dependencies] +@@ -28,10 +28,3 @@ tracing = "0.1" + # tidy-alphabetical-start libc = "0.2" + # tidy-alphabetical-end - -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" @@ -107,12 +108,12 @@ index e26d25d..fe343f8 100644 - "Win32_System_LibraryLoader", -] diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml -index 6714b3b..71d56b4 100644 +index 932310b..dce3c3f 100644 --- a/library/backtrace/Cargo.toml +++ b/library/backtrace/Cargo.toml -@@ -47,9 +47,6 @@ version = "0.32.0" +@@ -48,9 +48,6 @@ version = "0.32.0" default-features = false - features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] + features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive'] -[target.'cfg(windows)'.dependencies] -winapi = { version = "0.3.9", optional = true } @@ -120,7 +121,7 @@ index 6714b3b..71d56b4 100644 [build-dependencies] # Only needed for Android, but cannot be target dependent # https://github.com/rust-lang/cargo/issues/4932 -@@ -87,16 +84,6 @@ libbacktrace = [] +@@ -88,16 +85,6 @@ libbacktrace = [] libunwind = [] unix-backtrace = [] verify-winapi = [ @@ -138,18 +139,18 @@ index 6714b3b..71d56b4 100644 [[example]] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml -index 9bf2694..9fc6f66 100644 +index e4d3591..b548faf 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -62,21 +62,6 @@ semver = "1.0.17" +@@ -66,21 +66,6 @@ sysinfo = { version = "0.26.0", optional = true } [target.'cfg(not(target_os = "solaris"))'.dependencies] - fd-lock = "3.0.8" + fd-lock = "3.0.13" -[target.'cfg(windows)'.dependencies.junction] -version = "1.0.0" - -[target.'cfg(windows)'.dependencies.windows] --version = "0.46.0" +-version = "0.51.1" -features = [ - "Win32_Foundation", - "Win32_Security", @@ -164,7 +165,7 @@ index 9bf2694..9fc6f66 100644 pretty_assertions = "1.4" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 23c5cc7..91ecfd0 100644 +index c011909..989d8d4 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -2,7 +2,9 @@ @@ -180,34 +181,46 @@ index 23c5cc7..91ecfd0 100644 ] @@ -24,8 +26,6 @@ bytesize = "1.3" cargo = { path = "" } - cargo-credential = { version = "0.4.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-credential = { version = "0.4.1", path = "credential/cargo-credential" } + cargo-credential-libsecret = { version = "0.4.1", path = "credential/cargo-credential-libsecret" } +-cargo-credential-macos-keychain = { version = "0.4.1", path = "credential/cargo-credential-macos-keychain" } +-cargo-credential-wincred = { version = "0.4.1", path = "credential/cargo-credential-wincred" } 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" } -@@ -101,7 +101,6 @@ unicode-xid = "0.2.4" +@@ -102,7 +102,6 @@ unicode-xid = "0.2.4" url = "2.4.1" varisat = "0.2.2" - walkdir = "2.3.3" + walkdir = "2.4.0" -windows-sys = "0.48" [package] name = "cargo" -@@ -128,8 +127,6 @@ bytesize.workspace = true - cargo-platform.workspace = true +@@ -129,6 +128,7 @@ base64.workspace = true + bytesize.workspace = true cargo-credential.workspace = true - cargo-credential-libsecret.workspace = true --cargo-credential-macos-keychain.workspace = true --cargo-credential-wincred.workspace = true + cargo-platform.workspace = true ++cargo-credential-libsecret.workspace = true cargo-util.workspace = true - color-print.workspace = true clap = { workspace = true, features = ["wrap_help"] } -@@ -189,18 +186,6 @@ walkdir.workspace = true + color-print.workspace = true +@@ -189,9 +189,6 @@ walkdir.workspace = true + [target.'cfg(target_os = "linux")'.dependencies] + cargo-credential-libsecret.workspace = true + +-[target.'cfg(target_os = "macos")'.dependencies] +-cargo-credential-macos-keychain.workspace = true +- [target.'cfg(not(windows))'.dependencies] openssl = { workspace = true, optional = true } +@@ -195,21 +195,6 @@ cargo-credential-macos-keychain.workspace = true + [target.'cfg(not(windows))'.dependencies] + openssl = { workspace = true, optional = true } + +-[target.'cfg(windows)'.dependencies] +-cargo-credential-wincred.workspace = true +- -[target.'cfg(windows)'.dependencies.windows-sys] -workspace = true -features = [ @@ -235,7 +248,7 @@ index fc32e1c..ce5d708 100644 -[target.'cfg(windows)'.dependencies] -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] } diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml -index cba00f9..fb52b6e 100644 +index 616a79c..9fc3971 100644 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml @@ -20,10 +20,3 @@ shell-escape.workspace = true @@ -250,10 +263,10 @@ index cba00f9..fb52b6e 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 03bd555..32fdf26 100644 +index 702a14e..dafeec8 100644 --- a/src/tools/cargo/crates/home/Cargo.toml +++ b/src/tools/cargo/crates/home/Cargo.toml -@@ -14,6 +14,3 @@ include = [ +@@ -15,6 +15,3 @@ include = [ license.workspace = true repository = "https://github.com/rust-lang/cargo" description = "Shared definitions of home directories." @@ -261,7 +274,7 @@ index 03bd555..32fdf26 100644 -[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 c8db996..96aa498 100644 +index 8ba65b8..6678c23 100644 --- a/src/tools/cargo/credential/cargo-credential/Cargo.toml +++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml @@ -15,8 +15,5 @@ serde_json.workspace = true @@ -274,23 +287,26 @@ index c8db996..96aa498 100644 [dev-dependencies] snapbox = { workspace = true, features = ["examples"] } diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs -index ea82dce..df181db 100644 +index c2f8186..c420971 100644 --- a/src/tools/cargo/src/cargo/util/auth/mod.rs +++ b/src/tools/cargo/src/cargo/util/auth/mod.rs -@@ -529,8 +529,6 @@ fn credential_action( +@@ -529,11 +529,6 @@ fn credential_action( } "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"), "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), +- #[cfg(windows)] - "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), +- #[cfg(target_os = "macos")] - "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), +- #[cfg(target_os = "linux")] "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), - process => Box::new(CredentialProcessCredential::new(process)), - }; + name if BUILT_IN_PROVIDERS.contains(&name) => { + Box::new(cargo_credential::UnsupportedCredential {}) diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml -index bb1fa6e..2735e1e 100644 +index 31c6353..bdc4805 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml -@@ -28,13 +28,3 @@ home = "0.5.5" +@@ -29,13 +29,3 @@ home = "0.5.5" [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -305,7 +321,7 @@ index bb1fa6e..2735e1e 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 fd98d85..8c1d1379 100644 +index fd98d85..8c1d137 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"] } diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 80cb21a53..895d091b8 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -1,6 +1,6 @@ From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> Date: Wed, 6 Sep 2023 13:23:24 -0600 -Subject: [PATCH] Remove Windows dependencies +Subject: d-0021-vendor-remove-windows-dependencies MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit @@ -18,18 +18,20 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> vendor/console/Cargo.toml | 11 --------- vendor/curl-sys/Cargo.toml | 7 ------ vendor/curl/Cargo.toml | 10 -------- - vendor/dirs-sys-next/Cargo.toml | 3 --- - vendor/dirs-sys/Cargo.toml | 3 --- + vendor/dirs-sys-0.3.7/Cargo.toml | 3 --- + vendor/dirs-sys/Cargo.toml | 9 ------- + vendor/errno-0.3.1/Cargo.toml | 7 ------ vendor/errno/Cargo.toml | 6 ----- vendor/fd-lock/Cargo.toml | 8 ------- vendor/filetime/Cargo.toml | 7 ------ vendor/gix-sec/Cargo.toml | 12 ---------- + vendor/home-0.5.4/Cargo.toml | 8 ------- vendor/home/Cargo.toml | 7 ------ vendor/iana-time-zone/Cargo.toml | 4 ---- vendor/ignore/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-0.8.0/Cargo.toml | 8 ------- vendor/libloading/Cargo.toml | 8 ------- vendor/libssh2-sys/Cargo.toml | 8 ------- vendor/libz-sys/Cargo.toml | 3 --- @@ -42,6 +44,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- vendor/parking_lot_core/Cargo.toml | 3 --- vendor/reqwest/Cargo.toml | 3 --- + vendor/rustix-0.38.19/Cargo.toml | 17 ------------- vendor/rustix/Cargo.toml | 17 ------------- vendor/same-file/Cargo.toml | 2 -- vendor/snapbox/Cargo.toml | 6 ----- @@ -49,6 +52,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> vendor/stacker/Cargo.toml | 10 -------- vendor/sysinfo-0.26.7/Cargo.toml | 38 ----------------------------- vendor/sysinfo/Cargo.toml | 41 -------------------------------- + vendor/tempfile-3.8.0/Cargo.toml | 7 ------ vendor/tempfile/Cargo.toml | 7 ------ vendor/term/Cargo.toml | 6 ----- vendor/termcolor/Cargo.toml | 3 --- @@ -57,23 +61,24 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> vendor/tokio-native-tls/Cargo.toml | 17 ------------- vendor/tokio/Cargo.toml | 21 ---------------- vendor/uuid/Cargo.toml | 4 ---- + vendor/walkdir-2.3.3/Cargo.toml | 3 --- vendor/walkdir/Cargo.toml | 3 --- vendor/yansi-term/Cargo.toml | 3 --- - 56 files changed, 1 insertion(+), 489 deletions(-) + 58 files changed, 1 insertion(+), 495 deletions(-) -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/ +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" [dev-dependencies.zip] version = "0.6.4" +repository = "https://github.com/rust-cli/concolor" -Index: rust/vendor/ansi_term/Cargo.toml -=================================================================== ---- rust.orig/vendor/ansi_term/Cargo.toml -+++ rust/vendor/ansi_term/Cargo.toml +diff --git a/vendor/ansi_term/Cargo.toml b/vendor/ansi_term/Cargo.toml +index 0e5feba..3256c75 100644 +--- a/vendor/ansi_term/Cargo.toml ++++ b/vendor/ansi_term/Cargo.toml @@ -38,6 +38,3 @@ version = "1.0.39" [features] @@ -81,10 +86,10 @@ Index: rust/vendor/ansi_term/Cargo.toml -[target."cfg(target_os=\"windows\")".dependencies.winapi] -version = "0.3.4" -features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"] -Index: rust/vendor/anstream/Cargo.toml -=================================================================== ---- rust.orig/vendor/anstream/Cargo.toml -+++ rust/vendor/anstream/Cargo.toml +diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml +index 2919a8b..f403587 100644 +--- a/vendor/anstream/Cargo.toml ++++ b/vendor/anstream/Cargo.toml @@ -131,11 +131,4 @@ auto = [ ] default = [ @@ -97,10 +102,25 @@ Index: rust/vendor/anstream/Cargo.toml -[target."cfg(windows)".dependencies.anstyle-wincon] -version = "3.0.1" -optional = true -Index: rust/vendor/anstyle-query/Cargo.toml -=================================================================== ---- rust.orig/vendor/anstyle-query/Cargo.toml -+++ rust/vendor/anstyle-query/Cargo.toml +diff --git a/vendor/anstream-0.5.0/Cargo.toml b/vendor/anstream-0.5.0/Cargo.toml +index 1b5193c..9574485 100644 +--- a/vendor/anstream-0.5.0/Cargo.toml ++++ b/vendor/anstream-0.5.0/Cargo.toml +@@ -131,10 +131,5 @@ auto = [ + ] + default = [ + "auto", +- "wincon", + ] +-wincon = ["dep:anstyle-wincon"] + +-[target."cfg(windows)".dependencies.anstyle-wincon] +-version = "2.0.0" +-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 @@ -70,10 +70,3 @@ replace = """ <!-- next-url --> [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" @@ -112,10 +132,10 @@ Index: rust/vendor/anstyle-query/Cargo.toml - "Win32_System_Console", - "Win32_Foundation", -] -Index: rust/vendor/atty/Cargo.toml -=================================================================== ---- rust.orig/vendor/atty/Cargo.toml -+++ rust/vendor/atty/Cargo.toml +diff --git a/vendor/atty/Cargo.toml b/vendor/atty/Cargo.toml +index d6bf2d0..7cebc31 100644 +--- a/vendor/atty/Cargo.toml ++++ b/vendor/atty/Cargo.toml @@ -27,8 +27,5 @@ version = "0.1.6" [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -125,10 +145,10 @@ Index: rust/vendor/atty/Cargo.toml -features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"] [badges.travis-ci] repository = "softprops/atty" -Index: rust/vendor/backtrace/Cargo.toml -=================================================================== ---- rust.orig/vendor/backtrace/Cargo.toml -+++ rust/vendor/backtrace/Cargo.toml +diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml +index c13e7ee..7b01a6f 100644 +--- a/vendor/backtrace/Cargo.toml ++++ b/vendor/backtrace/Cargo.toml @@ -104,16 +104,6 @@ serialize-serde = ["serde"] std = [] unix-backtrace = [] @@ -154,10 +174,10 @@ Index: rust/vendor/backtrace/Cargo.toml -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -optional = true -Index: rust/vendor/chrono/Cargo.toml -=================================================================== ---- rust.orig/vendor/chrono/Cargo.toml -+++ rust/vendor/chrono/Cargo.toml +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 @@ -107,7 +107,6 @@ __internal_bench = ["criterion"] alloc = [] clock = [ @@ -181,10 +201,10 @@ Index: rust/vendor/chrono/Cargo.toml - "sysinfoapi", -] -optional = true -Index: rust/vendor/colored/Cargo.toml -=================================================================== ---- rust.orig/vendor/colored/Cargo.toml -+++ rust/vendor/colored/Cargo.toml +diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml +index dda2951..05b76bd 100644 +--- a/vendor/colored/Cargo.toml ++++ b/vendor/colored/Cargo.toml @@ -42,10 +42,3 @@ version = "=1.0.0-beta.3" [features] @@ -196,10 +216,10 @@ Index: rust/vendor/colored/Cargo.toml - "Win32_Foundation", - "Win32_System_Console", -] -Index: rust/vendor/console/Cargo.toml -=================================================================== ---- rust.orig/vendor/console/Cargo.toml -+++ rust/vendor/console/Cargo.toml +diff --git a/vendor/console/Cargo.toml b/vendor/console/Cargo.toml +index 85849e1..7c7be5a 100644 +--- a/vendor/console/Cargo.toml ++++ b/vendor/console/Cargo.toml @@ -59,14 +59,3 @@ default = [ ] windows-console-colors = ["ansi-parsing"] @@ -215,10 +235,10 @@ Index: rust/vendor/console/Cargo.toml - "Win32_Storage_FileSystem", - "Win32_UI_Input_KeyboardAndMouse", -] -Index: rust/vendor/curl-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/curl-sys/Cargo.toml -+++ rust/vendor/curl-sys/Cargo.toml +diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml +index b36d525..4b5cee1 100644 +--- a/vendor/curl-sys/Cargo.toml ++++ b/vendor/curl-sys/Cargo.toml @@ -73,13 +73,6 @@ zlib-ng-compat = [ version = "0.9.64" optional = true @@ -233,10 +253,10 @@ Index: rust/vendor/curl-sys/Cargo.toml [badges.appveyor] repository = "alexcrichton/curl-rust" -Index: rust/vendor/curl/Cargo.toml -=================================================================== ---- rust.orig/vendor/curl/Cargo.toml -+++ rust/vendor/curl/Cargo.toml +diff --git a/vendor/curl/Cargo.toml b/vendor/curl/Cargo.toml +index bfb59f4..d9f6854 100644 +--- a/vendor/curl/Cargo.toml ++++ b/vendor/curl/Cargo.toml @@ -107,16 +107,6 @@ optional = true version = "0.9.43" optional = true @@ -254,37 +274,37 @@ Index: rust/vendor/curl/Cargo.toml [badges.appveyor] repository = "alexcrichton/curl-rust" -Index: rust/vendor/dirs-sys-next/Cargo.toml -=================================================================== ---- rust.orig/vendor/dirs-sys-next/Cargo.toml -+++ rust/vendor/dirs-sys-next/Cargo.toml -@@ -25,8 +25,5 @@ version = "0.4.0" +diff --git a/vendor/dirs-sys-0.3.7/Cargo.toml b/vendor/dirs-sys-0.3.7/Cargo.toml +index 9951d24..0a86f4d 100644 +--- a/vendor/dirs-sys-0.3.7/Cargo.toml ++++ b/vendor/dirs-sys-0.3.7/Cargo.toml +@@ -22,6 +22,3 @@ version = "0.4" default-features = false [target."cfg(unix)".dependencies.libc] version = "0.2" -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] - [badges.maintenance] - status = "as-is" -Index: rust/vendor/dirs-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/dirs-sys/Cargo.toml -+++ rust/vendor/dirs-sys/Cargo.toml -@@ -22,6 +22,3 @@ version = "0.4" +diff --git a/vendor/dirs-sys-next/Cargo.toml b/vendor/dirs-sys-next/Cargo.toml +index e9d8d0c..acb2eb7 100644 +--- a/vendor/dirs-sys-next/Cargo.toml ++++ b/vendor/dirs-sys-next/Cargo.toml +@@ -25,8 +25,5 @@ version = "0.4.0" default-features = false [target."cfg(unix)".dependencies.libc] version = "0.2" -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] -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] + [badges.maintenance] + status = "as-is" +diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml +index d35ef19..e5e18a3 100644 +--- a/vendor/errno/Cargo.toml ++++ b/vendor/errno/Cargo.toml +@@ -41,9 +41,3 @@ default-features = false version = "0.2" + default-features = false -[target."cfg(windows)".dependencies.windows-sys] -version = "0.48" @@ -292,26 +312,26 @@ Index: rust/vendor/errno/Cargo.toml - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] -Index: rust/vendor/fd-lock/Cargo.toml -=================================================================== ---- rust.orig/vendor/fd-lock/Cargo.toml -+++ rust/vendor/fd-lock/Cargo.toml +diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml +index 8d0b8f0..eb1ef13 100644 +--- a/vendor/fd-lock/Cargo.toml ++++ b/vendor/fd-lock/Cargo.toml @@ -43,11 +43,3 @@ version = "3.0.8" [target."cfg(unix)".dependencies.rustix] - version = "0.37.0" + version = "0.38.0" features = ["fs"] - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" +-version = "0.48.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", - "Win32_System_IO", -] -Index: rust/vendor/filetime/Cargo.toml -=================================================================== ---- rust.orig/vendor/filetime/Cargo.toml -+++ rust/vendor/filetime/Cargo.toml +diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml +index 5c28c6c..b32fbcc 100644 +--- a/vendor/filetime/Cargo.toml ++++ b/vendor/filetime/Cargo.toml @@ -38,10 +38,3 @@ version = "0.3.5" [target."cfg(unix)".dependencies.libc] @@ -323,10 +343,10 @@ Index: rust/vendor/filetime/Cargo.toml - "Win32_Foundation", - "Win32_Storage_FileSystem", -] -Index: rust/vendor/gix-sec/Cargo.toml -=================================================================== ---- rust.orig/vendor/gix-sec/Cargo.toml -+++ rust/vendor/gix-sec/Cargo.toml +diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml +index 8605b90..9db4399 100644 +--- a/vendor/gix-sec/Cargo.toml ++++ b/vendor/gix-sec/Cargo.toml @@ -63,15 +63,3 @@ serde = [ [target."cfg(not(windows))".dependencies.libc] version = "0.2.123" @@ -343,10 +363,10 @@ Index: rust/vendor/gix-sec/Cargo.toml - "Win32_System_Memory", - "Win32_System_Threading", -] -Index: rust/vendor/home/Cargo.toml -=================================================================== ---- rust.orig/vendor/home/Cargo.toml -+++ rust/vendor/home/Cargo.toml +diff --git a/vendor/home/Cargo.toml b/vendor/home/Cargo.toml +index cd608b1..eecfb89 100644 +--- a/vendor/home/Cargo.toml ++++ b/vendor/home/Cargo.toml @@ -27,10 +27,3 @@ readme = "README.md" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/cargo" @@ -358,10 +378,10 @@ Index: rust/vendor/home/Cargo.toml - "Win32_Foundation", - "Win32_UI_Shell", -] -Index: rust/vendor/iana-time-zone/Cargo.toml -=================================================================== ---- rust.orig/vendor/iana-time-zone/Cargo.toml -+++ rust/vendor/iana-time-zone/Cargo.toml +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 @@ -52,7 +52,3 @@ version = "0.1.5" [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] @@ -370,10 +390,10 @@ Index: rust/vendor/iana-time-zone/Cargo.toml -[target."cfg(target_os = \"windows\")".dependencies.windows] -version = "0.48.0" -features = ["Globalization"] -Index: rust/vendor/ignore/Cargo.toml -=================================================================== ---- rust.orig/vendor/ignore/Cargo.toml -+++ rust/vendor/ignore/Cargo.toml +diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml +index b397dcf..2022a87 100644 +--- a/vendor/ignore/Cargo.toml ++++ b/vendor/ignore/Cargo.toml @@ -64,6 +64,3 @@ version = "0.5.0" [features] @@ -381,38 +401,10 @@ Index: rust/vendor/ignore/Cargo.toml - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.2" -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", - "hermit-abi", -- "windows-sys", - ] - default = ["close"] - -@@ -85,15 +84,3 @@ optional = true - [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] - version = "0.3" - optional = true -- --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_Foundation", -- "Win32_Storage_FileSystem", -- "Win32_Networking_WinSock", -- "Win32_Security", -- "Win32_System_IO", -- "Win32_System_Threading", --] --optional = true -Index: rust/vendor/is-terminal/Cargo.toml -=================================================================== ---- rust.orig/vendor/is-terminal/Cargo.toml -+++ rust/vendor/is-terminal/Cargo.toml +diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml +index 08933a7..b4b0482 100644 +--- a/vendor/is-terminal/Cargo.toml ++++ b/vendor/is-terminal/Cargo.toml @@ -54,14 +54,3 @@ features = ["stdio"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] @@ -428,10 +420,10 @@ Index: rust/vendor/is-terminal/Cargo.toml - -[target."cfg(windows)".dev-dependencies.tempfile] -version = "3" -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 +diff --git a/vendor/libloading-0.7.4/Cargo.toml b/vendor/libloading-0.7.4/Cargo.toml +index 65168d5..03df764 100644 +--- a/vendor/libloading-0.7.4/Cargo.toml ++++ b/vendor/libloading-0.7.4/Cargo.toml @@ -43,9 +43,3 @@ version = "1.1" [target."cfg(unix)".dependencies.cfg-if] version = "1" @@ -442,10 +434,10 @@ Index: rust/vendor/libloading-0.7.4/Cargo.toml - "errhandlingapi", - "libloaderapi", -] -Index: rust/vendor/libloading/Cargo.toml -=================================================================== ---- rust.orig/vendor/libloading/Cargo.toml -+++ rust/vendor/libloading/Cargo.toml +diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml +index 0165453..0dfc3c0 100644 +--- a/vendor/libloading/Cargo.toml ++++ b/vendor/libloading/Cargo.toml @@ -42,11 +42,3 @@ version = "1.1" [target."cfg(unix)".dependencies.cfg-if] @@ -458,10 +450,10 @@ Index: rust/vendor/libloading/Cargo.toml - "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 +diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml +index 45f4a71..516644c 100644 +--- a/vendor/libssh2-sys/Cargo.toml ++++ b/vendor/libssh2-sys/Cargo.toml @@ -43,16 +43,8 @@ version = "1.0.25" version = "0.3.11" @@ -479,10 +471,10 @@ Index: rust/vendor/libssh2-sys/Cargo.toml -[target."cfg(windows)".dependencies.openssl-sys] -version = "0.9.35" -optional = true -Index: rust/vendor/libz-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/libz-sys/Cargo.toml -+++ rust/vendor/libz-sys/Cargo.toml +diff --git a/vendor/libz-sys/Cargo.toml b/vendor/libz-sys/Cargo.toml +index f7414d5..ee1163c 100644 +--- a/vendor/libz-sys/Cargo.toml ++++ b/vendor/libz-sys/Cargo.toml @@ -65,6 +65,3 @@ zlib-ng = [ "libc", "cmake", @@ -490,10 +482,10 @@ Index: rust/vendor/libz-sys/Cargo.toml - -[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 +diff --git a/vendor/mio/Cargo.toml b/vendor/mio/Cargo.toml +index 42e28d0..b689d7b 100644 +--- a/vendor/mio/Cargo.toml ++++ b/vendor/mio/Cargo.toml @@ -102,8 +102,6 @@ default = ["log"] net = [] os-ext = [ @@ -516,10 +508,10 @@ Index: rust/vendor/mio/Cargo.toml - "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 +diff --git a/vendor/native-tls/Cargo.toml b/vendor/native-tls/Cargo.toml +index a059236..d36b44b 100644 +--- a/vendor/native-tls/Cargo.toml ++++ b/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] @@ -527,10 +519,10 @@ Index: rust/vendor/native-tls/Cargo.toml - -[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 +diff --git a/vendor/nu-ansi-term/Cargo.toml b/vendor/nu-ansi-term/Cargo.toml +index 209e055..aa40f02 100644 +--- a/vendor/nu-ansi-term/Cargo.toml ++++ b/vendor/nu-ansi-term/Cargo.toml @@ -45,13 +45,3 @@ version = "1.0.39" [features] @@ -545,10 +537,10 @@ Index: rust/vendor/nu-ansi-term/Cargo.toml - "handleapi", - "processenv", -] -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 +diff --git a/vendor/opener-0.5.2/Cargo.toml b/vendor/opener-0.5.2/Cargo.toml +index 8d91b5e..2d7313b 100644 +--- a/vendor/opener-0.5.2/Cargo.toml ++++ b/vendor/opener-0.5.2/Cargo.toml @@ -32,10 +32,6 @@ version = "0.9" [target."cfg(target_os = \"linux\")".dependencies.bstr] version = "1" @@ -560,10 +552,10 @@ Index: rust/vendor/opener-0.5.2/Cargo.toml [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -Index: rust/vendor/opener/Cargo.toml -=================================================================== ---- rust.orig/vendor/opener/Cargo.toml -+++ rust/vendor/opener/Cargo.toml +diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml +index 79b4be9..69cc269 100644 +--- a/vendor/opener/Cargo.toml ++++ b/vendor/opener/Cargo.toml @@ -40,8 +40,6 @@ version = "0.9" reveal = [ "dep:url", @@ -587,10 +579,10 @@ Index: rust/vendor/opener/Cargo.toml [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -Index: rust/vendor/os_info/Cargo.toml -=================================================================== ---- rust.orig/vendor/os_info/Cargo.toml -+++ rust/vendor/os_info/Cargo.toml +diff --git a/vendor/os_info/Cargo.toml b/vendor/os_info/Cargo.toml +index 52a062f..e1f347b 100644 +--- a/vendor/os_info/Cargo.toml ++++ b/vendor/os_info/Cargo.toml @@ -48,18 +48,3 @@ version = "1" [features] @@ -610,10 +602,10 @@ Index: rust/vendor/os_info/Cargo.toml - "winerror", - "winreg", -] -Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml -=================================================================== ---- rust.orig/vendor/parking_lot_core-0.8.6/Cargo.toml -+++ rust/vendor/parking_lot_core-0.8.6/Cargo.toml +diff --git a/vendor/parking_lot_core-0.8.6/Cargo.toml b/vendor/parking_lot_core-0.8.6/Cargo.toml +index 6981516..9fb8bd2 100644 +--- a/vendor/parking_lot_core-0.8.6/Cargo.toml ++++ b/vendor/parking_lot_core-0.8.6/Cargo.toml @@ -60,15 +60,3 @@ version = "0.2.8" [target."cfg(unix)".dependencies.libc] @@ -630,10 +622,10 @@ Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml - "errhandlingapi", - "handleapi", -] -Index: rust/vendor/parking_lot_core/Cargo.toml -=================================================================== ---- rust.orig/vendor/parking_lot_core/Cargo.toml -+++ rust/vendor/parking_lot_core/Cargo.toml +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 @@ -57,6 +57,3 @@ version = "0.3" [target."cfg(unix)".dependencies.libc] @@ -641,10 +633,10 @@ Index: rust/vendor/parking_lot_core/Cargo.toml - -[target."cfg(windows)".dependencies.windows-targets] -version = "0.48.0" -Index: rust/vendor/reqwest/Cargo.toml -=================================================================== ---- rust.orig/vendor/reqwest/Cargo.toml -+++ rust/vendor/reqwest/Cargo.toml +diff --git a/vendor/reqwest/Cargo.toml b/vendor/reqwest/Cargo.toml +index bca6039..c735e2f 100644 +--- a/vendor/reqwest/Cargo.toml ++++ b/vendor/reqwest/Cargo.toml @@ -443,6 +443,3 @@ features = ["serde-serialize"] [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] @@ -652,31 +644,11 @@ Index: rust/vendor/reqwest/Cargo.toml - -[target."cfg(windows)".dependencies.winreg] -version = "0.10" -Index: rust/vendor/rustix-0.37.6/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.6/Cargo.toml -+++ rust/vendor/rustix-0.37.6/Cargo.toml -@@ -232,15 +232,3 @@ package = "errno" - [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] - version = "1.5.2" - optional = true -- --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_Foundation", -- "Win32_Networking_WinSock", -- "Win32_NetworkManagement_IpHelper", -- "Win32_System_Threading", --] -- --[target."cfg(windows)".dev-dependencies.ctor] --version = "0.1.21" -Index: rust/vendor/rustix/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix/Cargo.toml -+++ rust/vendor/rustix/Cargo.toml -@@ -249,20 +249,3 @@ package = "errno" +diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml +index 78cdf49..37249c3 100644 +--- a/vendor/rustix/Cargo.toml ++++ b/vendor/rustix/Cargo.toml +@@ -252,20 +252,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -697,20 +669,20 @@ Index: rust/vendor/rustix/Cargo.toml - -[target."cfg(windows)".dev-dependencies.ctor] -version = "0.2.0" -Index: rust/vendor/same-file/Cargo.toml -=================================================================== ---- rust.orig/vendor/same-file/Cargo.toml -+++ rust/vendor/same-file/Cargo.toml +diff --git a/vendor/same-file/Cargo.toml b/vendor/same-file/Cargo.toml +index 4f66820..11ef472 100644 +--- a/vendor/same-file/Cargo.toml ++++ b/vendor/same-file/Cargo.toml @@ -25,5 +25,3 @@ license = "Unlicense/MIT" repository = "https://github.com/BurntSushi/same-file" [dev-dependencies.doc-comment] version = "0.3" -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" -Index: rust/vendor/snapbox/Cargo.toml -=================================================================== ---- rust.orig/vendor/snapbox/Cargo.toml -+++ rust/vendor/snapbox/Cargo.toml +diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml +index 2cb92d6..52e12d2 100644 +--- a/vendor/snapbox/Cargo.toml ++++ b/vendor/snapbox/Cargo.toml @@ -161,7 +161,6 @@ cmd = [ "dep:os_pipe", "dep:wait-timeout", @@ -728,10 +700,10 @@ Index: rust/vendor/snapbox/Cargo.toml -version = "0.48.0" -features = ["Win32_Foundation"] -optional = true -Index: rust/vendor/socket2/Cargo.toml -=================================================================== ---- rust.orig/vendor/socket2/Cargo.toml -+++ rust/vendor/socket2/Cargo.toml +diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml +index 3f1578c..bdac898 100644 +--- a/vendor/socket2/Cargo.toml ++++ b/vendor/socket2/Cargo.toml @@ -58,11 +58,3 @@ all = [] [target."cfg(unix)".dependencies.libc] @@ -744,10 +716,10 @@ Index: rust/vendor/socket2/Cargo.toml - "ws2ipdef", - "ws2tcpip", -] -Index: rust/vendor/stacker/Cargo.toml -=================================================================== ---- rust.orig/vendor/stacker/Cargo.toml -+++ rust/vendor/stacker/Cargo.toml +diff --git a/vendor/stacker/Cargo.toml b/vendor/stacker/Cargo.toml +index 160cbc0..ba02aac 100644 +--- a/vendor/stacker/Cargo.toml ++++ b/vendor/stacker/Cargo.toml @@ -43,13 +43,3 @@ version = "0.1.7" [build-dependencies.cc] @@ -762,10 +734,10 @@ Index: rust/vendor/stacker/Cargo.toml - "processthreadsapi", - "minwindef", -] -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 +diff --git a/vendor/sysinfo-0.26.7/Cargo.toml b/vendor/sysinfo-0.26.7/Cargo.toml +index f8719a4..deb2e40 100644 +--- a/vendor/sysinfo-0.26.7/Cargo.toml ++++ b/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] @@ -808,10 +780,10 @@ Index: rust/vendor/sysinfo-0.26.7/Cargo.toml - "shellapi", - "std", -] -Index: rust/vendor/sysinfo/Cargo.toml -=================================================================== ---- rust.orig/vendor/sysinfo/Cargo.toml -+++ rust/vendor/sysinfo/Cargo.toml +diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml +index 2a21a72..d526f46 100644 +--- a/vendor/sysinfo/Cargo.toml ++++ b/vendor/sysinfo/Cargo.toml @@ -75,44 +75,3 @@ version = "1.0" [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] @@ -857,14 +829,14 @@ Index: rust/vendor/sysinfo/Cargo.toml - "winsock2", - "sddl", -] -Index: rust/vendor/tempfile/Cargo.toml -=================================================================== ---- rust.orig/vendor/tempfile/Cargo.toml -+++ rust/vendor/tempfile/Cargo.toml +diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml +index 84ea801..bd37853 100644 +--- a/vendor/tempfile/Cargo.toml ++++ b/vendor/tempfile/Cargo.toml @@ -50,10 +50,3 @@ features = ["fs"] [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] - version = "0.3" + version = "0.4" - -[target."cfg(windows)".dependencies.windows-sys] -version = "0.48" @@ -872,10 +844,10 @@ Index: rust/vendor/tempfile/Cargo.toml - "Win32_Storage_FileSystem", - "Win32_Foundation", -] -Index: rust/vendor/term/Cargo.toml -=================================================================== ---- rust.orig/vendor/term/Cargo.toml -+++ rust/vendor/term/Cargo.toml +diff --git a/vendor/term/Cargo.toml b/vendor/term/Cargo.toml +index e89261e..ad5d62b 100644 +--- a/vendor/term/Cargo.toml ++++ b/vendor/term/Cargo.toml @@ -28,12 +28,6 @@ version = "2" [features] @@ -889,10 +861,10 @@ Index: rust/vendor/term/Cargo.toml [badges.appveyor] repository = "Stebalien/term" -Index: rust/vendor/termcolor/Cargo.toml -=================================================================== ---- rust.orig/vendor/termcolor/Cargo.toml -+++ rust/vendor/termcolor/Cargo.toml +diff --git a/vendor/termcolor/Cargo.toml b/vendor/termcolor/Cargo.toml +index dbdb6e8..8edc73e 100644 +--- a/vendor/termcolor/Cargo.toml ++++ b/vendor/termcolor/Cargo.toml @@ -35,6 +35,3 @@ name = "termcolor" bench = false @@ -900,11 +872,11 @@ Index: rust/vendor/termcolor/Cargo.toml - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.3" -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 +diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml +index f810025..0fbe3a1 100644 +--- a/vendor/terminal_size/Cargo.toml ++++ b/vendor/terminal_size/Cargo.toml +@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size" [target."cfg(not(windows))".dependencies.rustix] version = "0.38.0" features = ["termios"] @@ -915,10 +887,10 @@ Index: rust/vendor/terminal_size/Cargo.toml - "Win32_Foundation", - "Win32_System_Console", -] -Index: rust/vendor/termize/Cargo.toml -=================================================================== ---- rust.orig/vendor/termize/Cargo.toml -+++ rust/vendor/termize/Cargo.toml +diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml +index d248f4d..9bd9f37 100644 +--- a/vendor/termize/Cargo.toml ++++ b/vendor/termize/Cargo.toml @@ -49,8 +49,5 @@ rpath = false [dependencies] [target."cfg(unix)".dependencies.libc] @@ -928,10 +900,10 @@ Index: rust/vendor/termize/Cargo.toml -features = ["handleapi", "processenv", "wincon", "winbase"] [badges.cirrus-ci] repository = "JohnTitor/termize" -Index: rust/vendor/tokio-native-tls/Cargo.toml -=================================================================== ---- rust.orig/vendor/tokio-native-tls/Cargo.toml -+++ rust/vendor/tokio-native-tls/Cargo.toml +diff --git a/vendor/tokio-native-tls/Cargo.toml b/vendor/tokio-native-tls/Cargo.toml +index 76be3d3..3ada811 100644 +--- a/vendor/tokio-native-tls/Cargo.toml ++++ b/vendor/tokio-native-tls/Cargo.toml @@ -76,20 +76,3 @@ version = "0.10" [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework] @@ -953,10 +925,10 @@ Index: rust/vendor/tokio-native-tls/Cargo.toml - "wincrypt", - "winerror", -] -Index: rust/vendor/tokio/Cargo.toml -=================================================================== ---- rust.orig/vendor/tokio/Cargo.toml -+++ rust/vendor/tokio/Cargo.toml +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 @@ -122,11 +122,6 @@ net = [ "mio/os-ext", "mio/net", @@ -1003,10 +975,10 @@ Index: rust/vendor/tokio/Cargo.toml - "Win32_Foundation", - "Win32_Security_Authorization", -] -Index: rust/vendor/uuid/Cargo.toml -=================================================================== ---- rust.orig/vendor/uuid/Cargo.toml -+++ rust/vendor/uuid/Cargo.toml +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 @@ -185,10 +185,6 @@ version = "0.3" version = "0.2" package = "wasm-bindgen" @@ -1018,10 +990,10 @@ Index: rust/vendor/uuid/Cargo.toml [badges.is-it-maintained-issue-resolution] repository = "uuid-rs/uuid" -Index: rust/vendor/walkdir/Cargo.toml -=================================================================== ---- rust.orig/vendor/walkdir/Cargo.toml -+++ rust/vendor/walkdir/Cargo.toml +diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml +index 4c29a20..725e320 100644 +--- a/vendor/walkdir/Cargo.toml ++++ b/vendor/walkdir/Cargo.toml @@ -39,9 +39,6 @@ version = "1.0.1" [dev-dependencies.doc-comment] version = "0.3" @@ -1032,10 +1004,10 @@ Index: rust/vendor/walkdir/Cargo.toml [badges.appveyor] repository = "BurntSushi/walkdir" -Index: rust/vendor/yansi-term/Cargo.toml -=================================================================== ---- rust.orig/vendor/yansi-term/Cargo.toml -+++ rust/vendor/yansi-term/Cargo.toml +diff --git a/vendor/yansi-term/Cargo.toml b/vendor/yansi-term/Cargo.toml +index 0317866..88ce8ef 100644 +--- a/vendor/yansi-term/Cargo.toml ++++ b/vendor/yansi-term/Cargo.toml @@ -36,9 +36,6 @@ version = "1.0" [features] diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch index b02bcfafc..36065ace9 100644 --- a/debian/patches/d-armel-fix-lldb.patch +++ b/debian/patches/d-armel-fix-lldb.patch @@ -1,10 +1,10 @@ run panics if lldb is not installed and no output is produced.. -Index: rust/src/bootstrap/test.rs +Index: rust/src/bootstrap/src/core/build_steps/test.rs =================================================================== ---- rust.orig/src/bootstrap/test.rs -+++ rust/src/bootstrap/test.rs -@@ -1631,7 +1631,11 @@ note: if you're sure you want to do this +--- rust.orig/src/bootstrap/src/core/build_steps/test.rs ++++ rust/src/bootstrap/src/core/build_steps/test.rs +@@ -1779,7 +1779,11 @@ NOTE: if you're sure you want to do this .ok(); if let Some(ref vers) = lldb_version { cmd.arg("--lldb-version").arg(vers); diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch deleted file mode 100644 index eab9c456b..000000000 --- a/debian/patches/d-bootstrap-cargo-check-cfg.patch +++ /dev/null @@ -1,19 +0,0 @@ -our cargo doesn't know about the 'output' part yet, this patch can be dropped -with cargo >= 0.64 - -Index: rust/src/bootstrap/builder.rs -=================================================================== ---- rust.orig/src/bootstrap/builder.rs -+++ rust/src/bootstrap/builder.rs -@@ -1358,9 +1358,9 @@ impl<'a> Builder<'a> { - // complete list of features, so for that reason we don't enable checking of - // features for std crates. - cargo.arg(if mode != Mode::Std { -- "-Zcheck-cfg=names,values,output,features" -+ "-Zcheck-cfg=names,values,features" - } else { -- "-Zcheck-cfg=names,values,output" -+ "-Zcheck-cfg=names,values" - }); - - // Add extra cfg not defined in/by rustc diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch index 39f246be1..581c83e83 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -4,15 +4,15 @@ Subject: d-bootstrap-custom-debuginfo-path =================================================================== --- - src/bootstrap/lib.rs | 5 ++--- + src/bootstrap/src/lib.rs | 5 ++--- src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) -Index: rust/src/bootstrap/lib.rs +Index: rust/src/bootstrap/src/lib.rs =================================================================== ---- rust.orig/src/bootstrap/lib.rs -+++ rust/src/bootstrap/lib.rs -@@ -1145,10 +1145,9 @@ impl Build { +--- rust.orig/src/bootstrap/src/lib.rs ++++ rust/src/bootstrap/src/lib.rs +@@ -1163,10 +1163,9 @@ impl Build { match which { GitRepo::Rustc => { @@ -38,3 +38,17 @@ Index: rust/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs fn main() { std::thread::spawn(|| { println!("hello"); +Index: rust/src/bootstrap/src/core/builder.rs +=================================================================== +--- rust.orig/src/bootstrap/src/core/builder.rs ++++ rust/src/bootstrap/src/core/builder.rs +@@ -1775,7 +1775,8 @@ impl<'a> Builder<'a> { + cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to); + } + +- if self.config.rust_remap_debuginfo { ++ // Debian: this breaks with our vendored sources! ++ if false && self.config.rust_remap_debuginfo { + // FIXME: handle vendored sources + let registry_src = t!(home::cargo_home()).join("registry").join("src"); + let mut env_var = OsString::new(); diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch index 4cd8bc1cd..bd2c75946 100644 --- a/debian/patches/d-bootstrap-disable-git.patch +++ b/debian/patches/d-bootstrap-disable-git.patch @@ -10,11 +10,11 @@ Forwarded: not-needed src/bootstrap/dist.rs | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) -Index: rust/src/bootstrap/channel.rs +Index: rust/src/bootstrap/src/utils/channel.rs =================================================================== ---- rust.orig/src/bootstrap/channel.rs -+++ rust/src/bootstrap/channel.rs -@@ -36,6 +36,12 @@ pub struct Info { +--- rust.orig/src/bootstrap/src/utils/channel.rs ++++ rust/src/bootstrap/src/utils/channel.rs +@@ -35,6 +35,12 @@ pub struct Info { impl GitInfo { pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo { @@ -27,19 +27,20 @@ Index: rust/src/bootstrap/channel.rs // See if this even begins to look like a git dir if !dir.join(".git").exists() { match read_commit_info_file(dir) { -Index: rust/src/bootstrap/dist.rs +Index: rust/src/bootstrap/src/core/build_steps/dist.rs =================================================================== ---- rust.orig/src/bootstrap/dist.rs -+++ rust/src/bootstrap/dist.rs -@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball { - } +--- rust.orig/src/bootstrap/src/core/build_steps/dist.rs ++++ rust/src/bootstrap/src/core/build_steps/dist.rs +@@ -991,8 +991,10 @@ impl Step for PlainSourceTarball { - // If we're building from git sources, we need to vendor a complete distribution. -- if builder.rust_info().is_managed_git_subrepository() { + // If we're building from git or tarball sources, we need to vendor + // a complete distribution. +- if builder.rust_info().is_managed_git_subrepository() +- || builder.rust_info().is_from_tarball() + // + // Debian: short-circuited because the Debian package is also in a git + // repository, but cargo-vendor should not be installed or run. -+ if false && builder.rust_info().is_managed_git_subrepository() { - // Ensure we have the submodules checked out. - builder.update_submodule(Path::new("src/tools/cargo")); - builder.update_submodule(Path::new("src/tools/rust-analyzer")); ++ if false + { + if builder.rust_info().is_managed_git_subrepository() { + // Ensure we have the submodules checked out. diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch index 0d9ff8973..0bc6921dd 100644 --- a/debian/patches/d-bootstrap-no-assume-tools.patch +++ b/debian/patches/d-bootstrap-no-assume-tools.patch @@ -7,11 +7,11 @@ Subject: d-bootstrap-no-assume-tools src/bootstrap/builder/tests.rs | 4 ++++ 1 file changed, 4 insertions(+) -Index: rust/src/bootstrap/builder/tests.rs +Index: rust/src/bootstrap/src/tests/builder.rs =================================================================== ---- rust.orig/src/bootstrap/builder/tests.rs -+++ rust/src/bootstrap/builder/tests.rs -@@ -387,9 +387,13 @@ mod dist { +--- rust.orig/src/bootstrap/src/tests/builder.rs ++++ rust/src/bootstrap/src/tests/builder.rs +@@ -390,9 +390,13 @@ mod dist { #[test] fn dist_only_cross_host() { let b = TargetSelection::from_user("B"); diff --git a/debian/patches/d-bootstrap-permit-symlink-in-docs.patch b/debian/patches/d-bootstrap-permit-symlink-in-docs.patch index 9f088a228..d170c709c 100644 --- a/debian/patches/d-bootstrap-permit-symlink-in-docs.patch +++ b/debian/patches/d-bootstrap-permit-symlink-in-docs.patch @@ -1,10 +1,10 @@ partial revert of b9eedea4b0368fd1f00f204db75109ff444fab5b upstream -Index: rust/src/bootstrap/dist.rs +Index: rust/src/bootstrap/src/core/build_steps/dist.rs =================================================================== ---- rust.orig/src/bootstrap/dist.rs -+++ rust/src/bootstrap/dist.rs -@@ -81,6 +81,7 @@ impl Step for Docs { +--- rust.orig/src/bootstrap/src/core/build_steps/dist.rs ++++ rust/src/bootstrap/src/core/build_steps/dist.rs +@@ -79,6 +79,7 @@ impl Step for Docs { tarball.set_product_name("Rust Documentation"); tarball.add_bulk_dir(&builder.doc_out(host), dest); tarball.add_file(&builder.src.join("src/doc/robots.txt"), dest, 0o644); diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch index 792b05c82..98edfc568 100644 --- a/debian/patches/d-bootstrap-rustflags.patch +++ b/debian/patches/d-bootstrap-rustflags.patch @@ -4,15 +4,15 @@ Subject: d-bootstrap-rustflags =================================================================== --- - src/bootstrap/builder.rs | 12 ++++++++++++ + src/bootstrap/src/core/builder.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: rust/src/bootstrap/builder.rs +Index: rust/src/bootstrap/src/core/builder.rs =================================================================== ---- rust.orig/src/bootstrap/builder.rs -+++ rust/src/bootstrap/builder.rs -@@ -1385,6 +1385,18 @@ impl<'a> Builder<'a> { - } +--- rust.orig/src/bootstrap/src/core/builder.rs ++++ rust/src/bootstrap/src/core/builder.rs +@@ -1447,6 +1447,18 @@ impl<'a> Builder<'a> { + hostflags.arg("--check-cfg=values(bootstrap)"); } + // Debian-specific stuff here diff --git a/debian/patches/d-bootstrap-use-local-css.patch b/debian/patches/d-bootstrap-use-local-css.patch index 080cc9b85..33d05603b 100644 --- a/debian/patches/d-bootstrap-use-local-css.patch +++ b/debian/patches/d-bootstrap-use-local-css.patch @@ -4,14 +4,14 @@ Subject: d-bootstrap-use-local-css =================================================================== --- - src/bootstrap/doc.rs | 15 ++++----------- + src/bootstrap/src/core/build_steps/doc.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) -Index: rust/src/bootstrap/doc.rs +Index: rust/src/bootstrap/src/core/build_steps/doc.rs =================================================================== ---- rust.orig/src/bootstrap/doc.rs -+++ rust/src/bootstrap/doc.rs -@@ -350,7 +350,27 @@ impl Step for Standalone { +--- rust.orig/src/bootstrap/src/core/build_steps/doc.rs ++++ rust/src/bootstrap/src/core/build_steps/doc.rs +@@ -362,7 +362,27 @@ impl Step for Standalone { .arg("--index-page") .arg(&builder.src.join("src/doc/index.md")) .arg("--markdown-playground-url") @@ -40,7 +40,7 @@ Index: rust/src/bootstrap/doc.rs .arg("-o") .arg(&out) .arg(&path); -@@ -359,11 +379,6 @@ impl Step for Standalone { +@@ -371,11 +391,6 @@ impl Step for Standalone { cmd.arg("--disable-minification"); } diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch index 1e9f272f1..48458cca2 100644 --- a/debian/patches/d-disable-download-tests.patch +++ b/debian/patches/d-disable-download-tests.patch @@ -1,18 +1,18 @@ -Index: rust/src/bootstrap/config/tests.rs +Index: rust/src/bootstrap/src/tests/config.rs =================================================================== ---- rust.orig/src/bootstrap/config/tests.rs -+++ rust/src/bootstrap/config/tests.rs -@@ -13,6 +13,9 @@ fn parse(config: &str) -> Config { +--- rust.orig/src/bootstrap/src/tests/config.rs ++++ rust/src/bootstrap/src/tests/config.rs +@@ -18,6 +18,9 @@ fn parse(config: &str) -> Config { #[test] fn download_ci_llvm() { + // Debian: this will attempt to download LLVM + return; + - if crate::llvm::is_ci_llvm_modified(&parse("")) { + if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) { eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change"); return; -@@ -41,7 +44,11 @@ fn download_ci_llvm() { +@@ -46,6 +49,9 @@ fn download_ci_llvm() { // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 #[test] fn detect_src_and_out() { @@ -20,7 +20,5 @@ Index: rust/src/bootstrap/config/tests.rs + return; + fn test(cfg: Config, build_dir: Option<&str>) { -+ // This will bring absolute form of `src/bootstrap` path let current_dir = std::env::current_dir().unwrap(); - diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch deleted file mode 100644 index 4ac594d0d..000000000 --- a/debian/patches/d-fix-rustix-outline.patch +++ /dev/null @@ -1,46 +0,0 @@ -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-0.37.6/build.rs -=================================================================== ---- rust.orig/vendor/rustix-0.37.6/build.rs -+++ rust/vendor/rustix-0.37.6/build.rs -@@ -1,4 +1,3 @@ --#[cfg(feature = "cc")] - use cc::Build; - use std::env::var; - use std::io::Write; -@@ -158,16 +157,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.6/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.6/Cargo.toml -+++ rust/vendor/rustix-0.37.6/Cargo.toml -@@ -127,7 +127,6 @@ version = "3.4.0" - - [build-dependencies.cc] - version = "1.0.68" --optional = true - - [features] - all-apis = [ diff --git a/debian/patches/d-rustc-i686-baseline.patch b/debian/patches/d-rustc-i686-baseline.patch index bc1e55d91..e00dc112c 100644 --- a/debian/patches/d-rustc-i686-baseline.patch +++ b/debian/patches/d-rustc-i686-baseline.patch @@ -4,17 +4,17 @@ Subject: d-rustc-i686-baseline =================================================================== --- - compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- + compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +Index: rust/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs =================================================================== ---- rust.orig/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -+++ rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -@@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld, +--- rust.orig/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs ++++ rust/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +@@ -2,7 +2,7 @@ use crate::spec::{base, Cc, LinkerFlavor pub fn target() -> Target { - let mut base = super::linux_gnu_base::opts(); + let mut base = base::linux_gnu::opts(); - base.cpu = "pentium4".into(); + base.cpu = "pentiumpro".into(); base.max_atomic_width = Some(64); diff --git a/debian/patches/d-rustc-windows-ssp.patch b/debian/patches/d-rustc-windows-ssp.patch index 46b20fb97..b086b9a5d 100644 --- a/debian/patches/d-rustc-windows-ssp.patch +++ b/debian/patches/d-rustc-windows-ssp.patch @@ -4,14 +4,14 @@ Subject: d-rustc-windows-ssp Bug: https://github.com/rust-lang/rust/issues/68973 --- - compiler/rustc_target/src/spec/windows_gnu_base.rs | 2 ++ + compiler/rustc_target/src/spec/base/windows_gnu.rs | 2 ++ 1 file changed, 2 insertions(+) -Index: rust/compiler/rustc_target/src/spec/windows_gnu_base.rs +Index: rust/compiler/rustc_target/src/spec/base/windows_gnu.rs =================================================================== ---- rust.orig/compiler/rustc_target/src/spec/windows_gnu_base.rs -+++ rust/compiler/rustc_target/src/spec/windows_gnu_base.rs -@@ -41,6 +41,8 @@ pub fn opts() -> TargetOptions { +--- rust.orig/compiler/rustc_target/src/spec/base/windows_gnu.rs ++++ rust/compiler/rustc_target/src/spec/base/windows_gnu.rs +@@ -42,6 +42,8 @@ pub fn opts() -> TargetOptions { "-lmsvcrt", "-luser32", "-lkernel32", diff --git a/debian/patches/series b/debian/patches/series index ca50b1c7f..2dfca26e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,6 @@ c-0003-tests-add-missing-cross-disabled-checks.patch # pending, or forwarded u-reproducible-build.patch u-fix-get-toml-when-test.patch -u-disable-fp-precision-test-on-i386.patch u-riscv-disable-unpacked-split-debuginfo.patch u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch @@ -21,7 +20,6 @@ u-rustc-llvm-cross-flags.patch #u-allow-system-compiler-rt.patch # Debian-specific patches, not suitable for upstream -d-fix-rustix-outline.patch d-disable-download-tests.patch ## Patches needed by debian/prune-unused-deps, for building bootstrap @@ -47,7 +45,6 @@ d-bootstrap-use-local-css.patch d-bootstrap-custom-debuginfo-path.patch d-bootstrap-permit-symlink-in-docs.patch d-test-ignore-avx-44056.patch -d-bootstrap-cargo-check-cfg.patch d-armel-fix-lldb.patch # Work around for some porterboxes, keep this commented diff --git a/debian/patches/u-disable-fp-precision-test-on-i386.patch b/debian/patches/u-disable-fp-precision-test-on-i386.patch deleted file mode 100644 index d4845c9d0..000000000 --- a/debian/patches/u-disable-fp-precision-test-on-i386.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: liushuyu <liushuyu011@gmail.com> -Date: Tue, 25 Jul 2023 09:48:12 +0800 -Subject: [PATCH] core library: Disable fpmath tests for i386 ... - -This patch disables the floating-point epsilon test for i386 since -x87 registers are too imprecise and can't produce the expected -results. - -Forwarded: https://github.com/rust-lang/rust/pull/114042 ---- - library/core/src/num/f32.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rust/library/core/src/num/f32.rs -=================================================================== ---- rust.orig/library/core/src/num/f32.rs -+++ rust/library/core/src/num/f32.rs -@@ -800,7 +800,7 @@ impl f32 { - /// let angle = std::f32::consts::PI; - /// - /// let abs_difference = (angle.to_degrees() - 180.0).abs(); -- /// -+ /// # #[cfg(not(target_arch = "x86"))] - /// assert!(abs_difference <= f32::EPSILON); - /// ``` - #[must_use = "this returns the result of the operation, \ diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch index 1aff8de0f..09ba0552e 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/u-fix-get-toml-when-test.patch @@ -6,17 +6,16 @@ Bug: https://github.com/rust-lang/rust/issues/105766 Last-Update: 2023-03-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/src/bootstrap/config.rs +Index: rust/src/bootstrap/src/core/config/config.rs =================================================================== ---- rust.orig/src/bootstrap/config.rs -+++ rust/src/bootstrap/config.rs -@@ -1040,9 +1040,32 @@ impl Config { +--- rust.orig/src/bootstrap/src/core/config/config.rs ++++ rust/src/bootstrap/src/core/config/config.rs +@@ -1093,8 +1093,32 @@ impl Config { pub fn parse(args: &[String]) -> Config { #[cfg(test)] - fn get_toml(_: &Path) -> TomlConfig { - TomlConfig::default() -- } + fn get_toml(file: &Path) -> TomlConfig { + // Debian: We use previous version as a custom rustc, which + // unfortunately won't be picked up because config.toml isn't @@ -42,7 +41,7 @@ Index: rust/src/bootstrap/config.rs + .unwrap_or_else(|err| { + eprintln!("failed to parse TOML configuration '{}': {err}", file.display()); + crate::detail_exit(2); -+ }) } ++ }) + } #[cfg(not(test))] - fn get_toml(file: &Path) -> TomlConfig { diff --git a/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch b/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch index c7dd9de9d..6ca345e86 100644 --- a/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch +++ b/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch @@ -1,140 +1,121 @@ -Description: explicitly disable split unpacked debuginfo for now on riscv64, - it's broken and we don't want cargo to auto-enable it.. - https://github.com/llvm/llvm-project/issues/56642 - https://github.com/rust-lang/rust/issues/110224Z +From 471af8c5a382229e57656798900406e1ec82c5c8 Mon Sep 17 00:00:00 2001 +From: kxxt <rsworktech@outlook.com> +Date: Wed, 31 Jan 2024 09:02:18 +0800 +Subject: [PATCH] riscv only supports split_debuginfo=off for now -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs -@@ -1,4 +1,5 @@ --use crate::spec::{CodeModel, Target, TargetOptions}; -+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions}; +Disable packed/unpacked options for riscv linux/android. +Other riscv targets already only have the off option. + +The packed/unpacked options might be supported in the future. +See upstream issue for more details: +https://github.com/llvm/llvm-project/issues/56642 + +Fixes #110224 +--- + .../src/spec/targets/riscv32gc_unknown_linux_gnu.rs | 5 ++++- + .../src/spec/targets/riscv32gc_unknown_linux_musl.rs | 5 ++++- + .../rustc_target/src/spec/targets/riscv64_linux_android.rs | 5 ++++- + .../src/spec/targets/riscv64gc_unknown_linux_gnu.rs | 5 ++++- + .../src/spec/targets/riscv64gc_unknown_linux_musl.rs | 5 ++++- + 5 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs +index 06e8f1837637f..0be32cbd77165 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; +use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; pub fn target() -> Target { Target { -@@ -12,6 +13,7 @@ pub fn target() -> Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { features: "+m,+a,+f,+d,+c".into(), - llvm_abiname: "lp64d".into(), - max_atomic_width: Some(64), + llvm_abiname: "ilp32d".into(), + max_atomic_width: Some(32), + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..super::freebsd_base::opts() + ..base::linux_gnu::opts() }, } -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs -@@ -1,4 +1,5 @@ --use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions}; -+use crate::spec::{CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions}; +diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs +index 722703d2384fe..cfa9990dac9bd 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; +use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; pub fn target() -> Target { Target { -@@ -13,6 +14,7 @@ pub fn target() -> Target { - llvm_abiname: "lp64d".into(), - max_atomic_width: Some(64), - supported_sanitizers: SanitizerSet::SHADOWCALLSTACK, +@@ -12,6 +14,7 @@ pub fn target() -> Target { + features: "+m,+a,+f,+d,+c".into(), + llvm_abiname: "ilp32d".into(), + max_atomic_width: Some(32), + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..super::fuchsia_base::opts() + ..base::linux_musl::opts() }, } -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs -@@ -1,4 +1,5 @@ --use crate::spec::{CodeModel, Target, TargetOptions}; -+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions}; +diff --git a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs +index 40e447dbb8362..762197d7217c7 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, SanitizerSet, Target, TargetOptions}; +use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions}; pub fn target() -> Target { Target { -@@ -12,6 +13,7 @@ pub fn target() -> Target { - features: "+m,+a,+f,+d,+c".into(), +@@ -13,6 +15,7 @@ pub fn target() -> Target { llvm_abiname: "lp64d".into(), + supported_sanitizers: SanitizerSet::ADDRESS, max_atomic_width: Some(64), + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..super::linux_gnu_base::opts() + ..base::android::opts() }, } -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs -@@ -1,4 +1,5 @@ --use crate::spec::{CodeModel, Target, TargetOptions}; -+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions}; +diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs +index c0969d4e11eb9..e71929a190479 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; +use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; pub fn target() -> Target { Target { -@@ -12,6 +13,7 @@ pub fn target() -> Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { features: "+m,+a,+f,+d,+c".into(), llvm_abiname: "lp64d".into(), max_atomic_width: Some(64), + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..super::linux_musl_base::opts() - }, - } -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs -@@ -1,5 +1,6 @@ - use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy}; --use crate::spec::{RelocModel, Target, TargetOptions}; -+use crate::spec::{RelocModel, SplitDebuginfo, Target, TargetOptions}; -+use std::borrow::Cow; - - use super::SanitizerSet; - -@@ -23,6 +24,7 @@ pub fn target() -> Target { - emit_debug_gdb_scripts: false, - eh_frame_header: false, - supported_sanitizers: SanitizerSet::KERNELADDRESS, -+ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..Default::default() + ..base::linux_gnu::opts() }, } -Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs -+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs -@@ -1,4 +1,5 @@ --use crate::spec::{CodeModel, Target, TargetOptions}; -+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions}; +diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs +index 656e260d094d8..8ea28d6b162cc 100644 +--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs ++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs +@@ -1,4 +1,6 @@ +-use crate::spec::{base, CodeModel, Target, TargetOptions}; +use std::borrow::Cow; ++ ++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions}; pub fn target() -> Target { Target { -@@ -12,6 +13,7 @@ pub fn target() -> Target { +@@ -12,6 +14,7 @@ pub fn target() -> Target { features: "+m,+a,+f,+d,+c".into(), llvm_abiname: "lp64d".into(), max_atomic_width: Some(64), + supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..super::openbsd_base::opts() - }, - } -Index: rust/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs -+++ rust/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs -@@ -1,5 +1,6 @@ - use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy}; --use crate::spec::{RelocModel, SanitizerSet, Target, TargetOptions}; -+use crate::spec::{RelocModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions}; -+use std::borrow::Cow; - - pub fn target() -> Target { - Target { -@@ -20,6 +21,7 @@ pub fn target() -> Target { - emit_debug_gdb_scripts: false, - eh_frame_header: false, - supported_sanitizers: SanitizerSet::KERNELADDRESS, -+ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]), - ..Default::default() + ..base::linux_musl::opts() }, } diff --git a/debian/rules b/debian/rules index 88719d621..0b0819074 100755 --- a/debian/rules +++ b/debian/rules @@ -235,10 +235,10 @@ debian/config.toml: debian/config.toml.in debian/rules if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \ then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi # Work around low-memory (32-bit) architectures: https://github.com/rust-lang/rust/issues/45854 -# i386 and x32 fail to mmap rustc_driver when building rustdoc in >1.60 -ifneq (,$(filter $(DEB_BUILD_ARCH), armhf armel i386 mips mipsel powerpc powerpcspe x32)) - sed -i -e 's/^debuginfo-level = .*/debuginfo-level = 0/g' "$@" -endif +# otherwise they fail to mmap rustc_driver when building rustdoc in >1.60 + if [ $(DEB_BUILD_ARCH_BITS) == "32" ]; then \ + sed -i -e 's/^debuginfo-level = .*/debuginfo-level = 0/g' "$@"; \ + fi check-no-old-llvm: # fail the build if we have any instances of OLD_LLVM_VERSION in debian, except for debian/changelog diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index a9174bac2..215200a30 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,5 +1,6 @@ # Test data rustc source: source-is-missing [src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/*.html] +rustc source: source-is-missing [tests/rustdoc/decl-trailing-whitespace.declaration.html] rustc source: source-is-missing [tests/rustdoc/notable-trait/doc-notable_trait*.html] rustc source: source-is-missing [tests/rustdoc/notable-trait/spotlight*.html] rustc source: source-is-missing [vendor/html5ever/data/bench/*.html] diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index 87d575953..a3eed63dc 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -27,6 +27,7 @@ vendor/term/src/terminfo/parser/names.rs CONTRIBUTING.md README.md RELEASES.md +compiler/rustc_baked_icu_data/src/data/mod.rs compiler/rustc_codegen_cranelift/docs/dwarf.md compiler/rustc_codegen_gcc/Readme.md compiler/rustc_codegen_ssa/messages.ftl @@ -36,7 +37,6 @@ library/std/src/sys/sgx/abi/entry.S library/stdarch/CONTRIBUTING.md library/stdarch/crates/core_arch/src/aarch64/neon/generated.rs library/stdarch/crates/std_detect/README.md -src/bootstrap/CHANGELOG.md src/doc/*/CODE_OF_CONDUCT.md src/doc/book/first-edition/src/the-stack-and-the-heap.md src/doc/edition-guide/src/rust-2018/index.md @@ -116,13 +116,16 @@ vendor/handlebars/src/lib.rs vendor/handlebars/src/render.rs vendor/handlebars/src/template.rs vendor/humansize/src/lib.rs +vendor/icu_locid_transform_data/data/mod.rs vendor/ipnet/RELEASES.md +vendor/kstring/benches/clone.rs vendor/lazy_static/src/lib.rs vendor/maplit/README.rst vendor/mdbook/CONTRIBUTING.md vendor/p384/src/arithmetic/hash2curve.rs vendor/pasetors/src/token.rs vendor/portable-atomic/src/imp/atomic128/README.md +vendor/portable-atomic/src/imp/interrupt/README.md vendor/portable-atomic/src/lib.rs vendor/pulldown-cmark/tests/suite/footnotes.rs vendor/rustc-demangle/src/legacy.rs @@ -181,10 +184,8 @@ vendor/mdbook/src/theme/book.js vendor/mdbook/src/theme/searcher/searcher.js # Trivial glue code for C <-> Rust -library/backtrace/src/android-api.c library/backtrace/crates/line-tables-only/src/callback.c vendor/backtrace/src/android-api.c -vendor/errno-dragonfly/src/errno.c vendor/stacker/src/arch/windows.c # False-positive, misc @@ -286,7 +287,7 @@ tests/*/*/*.stderr tests/*/*/*.stdout tests/*/*/*/*.rs tests/auxiliary/rust_test_helpers.c -tests/coverage-map/status-quo/*.cov-map +tests/coverage/*.cov-map tests/debuginfo/type-names.cdb.js tests/run-make/*/*.c tests/run-make/libtest-junit/output-default.xml @@ -337,8 +338,17 @@ vendor/hmac/tests/data/*.blb vendor/html5ever/data/bench/*.html vendor/icu_locid/benches/fixtures/*.json vendor/icu_locid/tests/fixtures/*.json +vendor/icu_locid_transform/benches/fixtures/locales.json +vendor/icu_locid_transform/benches/fixtures/uncanonicalized-locales.json +vendor/icu_locid_transform/tests/fixtures/canonicalize.json +vendor/icu_locid_transform/tests/fixtures/maximize.json +vendor/icu_locid_transform/tests/fixtures/minimize.json +vendor/icu_provider_adapters/tests/data/blob.postcard +vendor/icu_provider_adapters/tests/data/config.json vendor/icu_provider_adapters/tests/data/langtest/*/*.json vendor/icu_provider_adapters/tests/data/langtest/*/*/*/*.json +vendor/icu_provider_adapters/tests/data/langtest/de.json +vendor/icu_provider_adapters/tests/data/langtest/ro.json vendor/idna/tests/IdnaTest*.txt vendor/idna/tests/punycode_tests.json vendor/im-rc/proptest-regressions/*.txt @@ -347,7 +357,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/litemap/benches/testdata/large_litemap.postcard vendor/lsp-types/tests/tsc-unix.lsif vendor/md-5/tests/data/*.blb vendor/mdbook/test_book/src/individual/paragraph.md @@ -388,11 +397,16 @@ vendor/serde_json/tests/lexical/parse.rs vendor/sha1/tests/data/sha1.blb vendor/sha2/tests/data/*.blb vendor/spki/tests/examples/*.der +vendor/tabled/tests/core/iter_table.rs +vendor/tabled/tests/settings/colorization.rs +vendor/tabled/tests/settings/padding_test.rs 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-0.19.11/tests/fixtures/invalid/control/*.stderr +vendor/toml_edit-0.19.11/tests/fixtures/invalid/encoding/utf16.stderr vendor/toml_edit/tests/fixtures/invalid/*/*.stderr vendor/unicode-ident/tests/fst/*.fst vendor/unicode-segmentation/src/testdata.rs @@ -405,15 +419,26 @@ vendor/wasm-bindgen/tests/headless/* vendor/wasm-bindgen/tests/wasm/* vendor/wasm-bindgen/tests/worker/modules.js vendor/web-sys/tests/wasm/*.js -vendor/zerovec/benches/testdata/*.postcard +vendor/winnow-0.4.7/benches/contains_token.rs vendor/zip/tests/data/*.zip # Compromise, ideally we'd autogenerate these # Should already by documented in debian/copyright +compiler/rustc_baked_icu_data/src/data/macros/fallback_likelysubtags_v1.data.rs +compiler/rustc_baked_icu_data/src/data/macros/fallback_parents_v1.data.rs +compiler/rustc_baked_icu_data/src/data/macros/fallback_supplement_co_v1.data.rs src/doc/rustc-dev-guide/src/mir/mir_*.svg src/librustdoc/html/static/css/normalize.css src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs src/tools/rust-analyzer/crates/parser/src/syntax_kind/generated.rs +vendor/icu_locid_transform_data/data/macros/fallback_likelysubtags_v1.data.rs +vendor/icu_locid_transform_data/data/macros/fallback_parents_v1.data.rs +vendor/icu_locid_transform_data/data/macros/fallback_supplement_co_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_aliases_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_ext_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_l_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_likelysubtags_sr_v1.data.rs +vendor/icu_locid_transform_data/data/macros/locid_transform_script_dir_v1.data.rs vendor/linux-raw-sys/src/x86_64/general.rs vendor/pest_meta/src/grammar.rs vendor/regex-syntax/src/unicode_tables/*.rs @@ -425,19 +450,17 @@ vendor/unicode-script/src/tables.rs vendor/unicode-segmentation/src/tables.rs vendor/wasi/src/lib_generated.rs vendor/windows-bindgen/default/*.winmd -compiler/rustc_baked_icu_data/src/data/list/and_v1/es.rs.data -compiler/rustc_baked_icu_data/src/data/fallback/likelysubtags_v1/und.rs.data -compiler/rustc_baked_icu_data/src/data/fallback/parents_v1/und.rs.data # Compromise, ideally we'd package these in their own package src/librustdoc/html/static/fonts/*.woff2 # file brokenness (detected as Algol source code) compiler/rustc_builtin_macros/src/global_allocator.rs +compiler/rustc_codegen_gcc/build_system/src/utils.rs compiler/rustc_driver/src/lib.rs compiler/rustc_expand/src/mbe/quoted.rs compiler/rustc_macros/src/symbols/tests.rs -compiler/rustc_trait_selection/src/solve/search_graph/mod.rs +compiler/stable_mir/src/mir/visit.rs library/alloc/src/slice/tests.rs library/std/src/sys/unix/process/process_unix.rs library/stdarch/crates/stdarch-verify/src/lib.rs @@ -481,6 +504,11 @@ vendor/color-print-proc-macro/src/parse/color_tag.rs vendor/color-print-proc-macro/src/parse/util.rs vendor/compiler_builtins/libm/src/math/atan.rs vendor/datafrog/src/lib.rs +vendor/derivative/src/cmp.rs +vendor/derivative/src/debug.rs +vendor/derivative/src/hash.rs +vendor/derivative/src/lib.rs +vendor/derivative/src/matcher.rs vendor/derive_more/src/*.rs vendor/digest/src/core_api/rt_variable.rs vendor/digest/src/core_api/wrapper.rs @@ -505,6 +533,10 @@ vendor/gix-config/src/parse/events.rs vendor/gix-config/src/parse/nom/mod.rs vendor/gix-date/src/parse.rs vendor/gix-discover/src/is.rs +vendor/gix-features-0.35.0/src/parallel/mod.rs +vendor/gix-features-0.35.0/src/parallel/reduce.rs +vendor/gix-features-0.35.0/src/zlib/mod.rs +vendor/gix-features-0.35.0/src/zlib/stream/inflate.rs vendor/gix-features/src/parallel/mod.rs vendor/gix-features/src/parallel/reduce.rs vendor/gix-features/src/zlib/mod.rs @@ -521,11 +553,12 @@ 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/gix-url/src/lib.rs +vendor/gix-url/src/parse.rs vendor/humansize/src/allocating.rs vendor/icu_locid/tests/langid.rs vendor/icu_locid/tests/locale.rs vendor/indoc/src/lib.rs -vendor/libm-0.1.4/src/math/atan.rs vendor/libm/src/math/atan.rs vendor/miniz_oxide*/src/deflate/mod.rs vendor/miniz_oxide*/src/inflate/mod.rs @@ -602,6 +635,11 @@ 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-0.19.11/src/parser/key.rs +vendor/toml_edit-0.19.11/src/parser/mod.rs +vendor/toml_edit-0.19.11/src/parser/strings.rs +vendor/toml_edit-0.19.11/src/raw_string.rs +vendor/toml_edit-0.19.11/tests/testsuite/parse.rs vendor/toml_edit/src/parser/document.rs vendor/toml_edit/src/parser/key.rs vendor/toml_edit/src/parser/mod.rs @@ -619,6 +657,22 @@ vendor/varisat/src/solver.rs vendor/vec_mut_scan/src/lib.rs vendor/windows-bindgen/src/lib.rs vendor/windows-bindgen/src/rust/constants.rs +vendor/winnow-0.4.7/examples/css/parser.rs +vendor/winnow-0.4.7/examples/http/parser.rs +vendor/winnow-0.4.7/examples/http/parser_streaming.rs +vendor/winnow-0.4.7/examples/json/*.rs +vendor/winnow-0.4.7/examples/ndjson/parser.rs +vendor/winnow-0.4.7/src/ascii/mod.rs +vendor/winnow-0.4.7/src/binary/bits/mod.rs +vendor/winnow-0.4.7/src/binary/bits/tests.rs +vendor/winnow-0.4.7/src/binary/mod.rs +vendor/winnow-0.4.7/src/combinator/branch.rs +vendor/winnow-0.4.7/src/combinator/core.rs +vendor/winnow-0.4.7/src/combinator/parser.rs +vendor/winnow-0.4.7/src/combinator/sequence.rs +vendor/winnow-0.4.7/src/combinator/tests.rs +vendor/winnow-0.4.7/src/error.rs +vendor/winnow-0.4.7/src/token/mod.rs vendor/winnow/benches/number.rs vendor/winnow/examples/css/parser.rs vendor/winnow/examples/http/parser.rs @@ -627,6 +681,7 @@ vendor/winnow/examples/json/parser.rs vendor/winnow/examples/json/parser_dispatch.rs vendor/winnow/examples/json/parser_partial.rs vendor/winnow/examples/ndjson/example.ndjson +vendor/winnow-0.4.7/examples/ndjson/example.ndjson vendor/winnow/examples/ndjson/parser.rs vendor/winnow/src/ascii/mod.rs vendor/winnow/src/binary/bits/mod.rs |