diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:32:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:32:18 +0000 |
| commit | 6efd0735800a63d26445057972174dd809f9f3da (patch) | |
| tree | 586f3ecee26715446b6275993964016322d2a002 | |
| parent | Merging upstream version 1.74.1+dfsg1. (diff) | |
| download | rustc-6efd0735800a63d26445057972174dd809f9f3da.tar.xz rustc-6efd0735800a63d26445057972174dd809f9f3da.zip | |
Merging debian version 1.74.1+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
25 files changed, 529 insertions, 552 deletions
diff --git a/debian/architecture.mk b/debian/architecture.mk index dd027a13e..bbf81eef0 100644 --- a/debian/architecture.mk +++ b/debian/architecture.mk @@ -7,7 +7,10 @@ $(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\ $(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\ $(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\ $(1))))) -rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM) + +rust_os = $(if $(findstring -hurd-,-$(2)-),$(subst gnu,hurd-gnu,$(1)),$1) + +rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$(call rust_os,$($(1)_GNU_SYSTEM),$($(1)_ARCH_OS)) $(foreach machine,BUILD HOST TARGET,\ $(eval $(call rust_type_setvar,DEB_$(machine)))) diff --git a/debian/changelog b/debian/changelog index efea63275..5ae9dd3ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +rustc (1.74.1+dfsg1-1) unstable; urgency=medium + + * dwz: bump limit to avoid s390x build failures + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Thu, 30 May 2024 11:25:53 +0200 + +rustc (1.74.1+dfsg1-1~exp1) experimental; urgency=medium + + [ Fabian Grünbichler ] + * New upstream release + + [ Samuel Thibault ] + * architecture.mk: Adapt to llvm/rust's hurd naming + * rules: Disable profiling on Hurd ports, llvm does not provide it yet + * rules: Set the number of expected failures on Hurd ports + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Wed, 29 May 2024 11:24:48 +0200 + rustc (1.73.0+dfsg1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 907ceb62b..227be03a8 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,9 @@ Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.17.14), python3:native, - cargo:native (>= 1.72.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (>= 1.72.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (<= 1.73.0++) <!pkg.rustc.dlstage0>, + 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>, llvm-16-dev:native, llvm-16-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>, @@ -89,7 +89,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.73 +Package: libstd-rust-1.74 Section: libs Architecture: any Multi-Arch: same @@ -116,7 +116,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libstd-rust-1.73 (= ${binary:Version}), + libstd-rust-1.74 (= ${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 @@ -311,7 +311,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.73 (= ${binary:Version}) + libstd-rust-1.74 (= ${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 a2b1a2596..6e55fd7b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -48,6 +48,7 @@ Files-Excluded: vendor/libloading/tests/*.dll # Misc vendor/*/icon_CLion.svg + vendor/prettydiff/screens/*.png vendor/wasm-bindgen/guide vendor/wasm-bindgen/examples/import_js/index.js vendor/wasm-bindgen/examples/import_js/webpack.config.js @@ -55,18 +56,23 @@ Files-Excluded: # DO NOT EDIT below, AUTOGENERATED vendor/addr2line-0.19.0 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/anyhow-1.0.72 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/block-buffer-0.10.2 vendor/bstr-0.2.17 + vendor/bstr-1.5.0 vendor/bumpalo-3.11.1 vendor/cc-1.0.73 vendor/chalk-derive @@ -74,7 +80,9 @@ Files-Excluded: vendor/chalk-recursive vendor/chalk-solve vendor/clap-4.2.4 + 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 @@ -99,7 +107,6 @@ Files-Excluded: vendor/crossbeam-epoch-0.9.13 vendor/crossbeam-utils-0.8.14 vendor/crypto-common-0.1.3 - vendor/ctor vendor/ctrlc vendor/curl-sys-0.4.63+curl-8.1.2 vendor/derive_arbitrary @@ -108,30 +115,31 @@ Files-Excluded: vendor/directories vendor/dot vendor/either-1.6.1 - vendor/env_logger-0.9.3 + 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/filetime-0.2.16 - vendor/filetime-0.2.19 + vendor/filetime-0.2.21 vendor/fixedbitset + vendor/flate2-1.0.26 vendor/fsevent-sys vendor/fst - vendor/fwdansi 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/heck-0.3.3 vendor/hermit-abi-0.2.6 - vendor/hermit-abi-0.3.1 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index vendor/ignore-0.4.18 vendor/inotify vendor/inotify-sys - vendor/io-lifetimes-1.0.9 - vendor/is-terminal-0.4.7 + vendor/is-terminal-0.4.8 vendor/itoa-1.0.2 vendor/jemalloc-sys vendor/junction @@ -145,12 +153,11 @@ Files-Excluded: vendor/libmimalloc-sys vendor/libnghttp2-sys vendor/linked-hash-map - vendor/linux-raw-sys-0.3.2 - vendor/linux-raw-sys-0.4.3 + vendor/linux-raw-sys-0.4.5 vendor/log-0.4.17 - vendor/lsp-server vendor/lzma-sys-0.1.17 vendor/mach + vendor/memchr-2.5.0 vendor/memoffset-0.7.1 vendor/mimalloc vendor/miniz_oxide-0.6.2 @@ -168,8 +175,9 @@ Files-Excluded: 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/output_vt100 + vendor/openssl-sys-0.9.90 vendor/parking_lot_core-0.9.6 vendor/paste vendor/pest-2.6.0 @@ -179,7 +187,6 @@ Files-Excluded: vendor/petgraph vendor/pin-project-lite-0.2.9 vendor/pkg-config-0.3.25 - vendor/pretty_assertions-1.3.0 vendor/proc-macro2-1.0.60 vendor/proc-macro2-1.0.63 vendor/protobuf @@ -188,6 +195,8 @@ Files-Excluded: vendor/quote-1.0.26 vendor/quote-1.0.28 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/redox_syscall-0.2.13 @@ -196,9 +205,7 @@ Files-Excluded: vendor/regex-syntax-0.6.26 vendor/region vendor/rustc-build-sysroot - vendor/rustix-0.37.20 - vendor/rustix-0.37.6 - vendor/rustix-0.38.2 + vendor/rustix-0.38.6 vendor/ryu-1.0.10 vendor/salsa vendor/salsa-macros @@ -208,38 +215,38 @@ Files-Excluded: vendor/semver-1.0.17 vendor/serde-1.0.156 vendor/serde-1.0.160 - vendor/serde-1.0.164 + vendor/serde-1.0.185 vendor/serde_derive-1.0.156 vendor/serde_derive-1.0.160 - vendor/serde_derive-1.0.164 + vendor/serde_derive-1.0.185 vendor/serde_json-1.0.81 vendor/serde_json-1.0.97 vendor/serde_json-1.0.99 vendor/sha2-0.10.2 vendor/slice-group-by vendor/smallvec-1.10.0 - vendor/syn-1.0.102 vendor/syn-2.0.18 - vendor/syn-2.0.27 vendor/syn-2.0.8 - vendor/tar-0.4.38 vendor/target-lexicon - vendor/tempfile-3.6.0 vendor/thiserror-1.0.40 - vendor/thiserror-1.0.44 vendor/thiserror-impl-1.0.40 - vendor/thiserror-impl-1.0.44 vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl vendor/tikv-jemalloc-sys + vendor/time-0.3.22 + 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/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/vcpkg + vendor/url-2.4.0 vendor/walkdir-2.3.2 vendor/wasmtime-jit-icache-coherence vendor/web-sys-0.3.61 @@ -343,6 +350,13 @@ Copyright: 2019-2023 Robert Vojta <rvojta@me.com> License: MIT OR Apache-2.0 Comment: see https://github.com/zrzka/anes-rs +Files: vendor/ansi_term/* +Copyright: 2014-2019 ogham@bsago.me + 2014-2019 Ryan Scheel (Havvy) <ryan.havvy@gmail.com> + 2014-2019 Josh Triplett <josh@joshtriplett.org> +License: MIT +Comment: see https://github.com/ogham/rust-ansi-term + Files: vendor/anstream/* vendor/anstyle/* @@ -469,9 +483,7 @@ Copyright: 2016-2019 The Rust Project Developers License: MIT OR Apache-2.0 Comment: see https://github.com/messense/rustc-test -Files: - vendor/addr2line/* - vendor/addr2line-*/* +Files: vendor/addr2line/* Copyright: 2016-2021 Nick Fitzgerald <fitzgen@gmail.com> 2016-2021 Philip Craig <philipjcraig@gmail.com> @@ -650,6 +662,11 @@ 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/* @@ -712,9 +729,7 @@ Comment: see https://github.com/enarx/ciborium Files: vendor/clap/* - vendor/clap-4.*/* vendor/clap_builder/* - vendor/clap_builder-4.*/* vendor/clap_complete/* vendor/clap_derive/* vendor/clap_lex/* @@ -742,6 +757,27 @@ Copyright: 2016-2020 Thomas Wickham <mackwic@gmail.com> License: MPL-2.0 Comment: see https://github.com/mackwic/colored +Files: + vendor/color-print/* + vendor/color-print-proc-macro/* +Copyright: 2021-2024 Johann David <johann.david.dev@protonmail.com> +License: MIT OR Apache-2.0 +Comment: see https://gitlab.com/yolenoyer/color-print + +Files: vendor/comma/* +Copyright: 2019-2023 Ethan McTague <ethan@tague.me> +License: MIT +Comment: see https://github.com/emctague/comma + +Files: + vendor/console/* + vendor/indicatif/* +Copyright: 2017-2024 Armin Ronacher <armin.ronacher@active-4.com> +License: MIT +Comment: + see https://github.com/console-rs/console + see https://github.com/console-rs/indicatif + Files: vendor/content_inspector/* Copyright: 2018-2018 David Peter <mail@david-peter.de> License: MIT or Apache-2.0 @@ -810,8 +846,11 @@ Comment: see https://github.com/xacrimon/dashmap Files: vendor/darling/* + vendor/darling-0.*/* vendor/darling_core/* + vendor/darling_core-0.*/* vendor/darling_macro/* + vendor/darling_macro-0.*/* Copyright: 2017-2024 Ted Driggs <ted.driggs@outlook.com> License: MIT Comment: see https://github.com/TedDriggs/darling @@ -824,16 +863,27 @@ Copyright: License: Apache-2.0 or MIT Comment: see https://github.com/rust-lang-nursery/datafrog +Files: vendor/deranged/* +Copyright: 2020-2023 Jacob Pratt <jacob@jhpratt.dev> +License: MIT OR Apache-2.0 +Comment: see https://github.com/jhpratt/deranged + +Files: + vendor/derive_builder/* + vendor/derive_builder_core/* + vendor/derive_builder_macro/* +Copyright: 2016-2024 Colin Kiegel <kiegel@gmx.de> + 2016-2024 Pascal Hertleif <killercup@gmail.com> + 2016-2024 Jan-Erik Rediger <janerik@fnordig.de> + 2016-2024 Ted Driggs <ted.driggs@outlook.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/colin-kiegel/rust-derive-builder + Files: vendor/derive_more/* Copyright: 2016-2023 Jelte Fennema <github-tech@jeltef.nl> License: MIT Comment: see https://github.com/JelteF/derive_more -Files: vendor/derive-new/* -Copyright: 2016-2020 Nick Cameron <ncameron@mozilla.com> -License: MIT -Comment: see https://github.com/nrc/derive-new - Files: vendor/derive_setters/* Copyright: 2019-2023 Lymia Aluysia <lymia@lymiahugs.com> License: MIT or Apache-2.0 @@ -865,7 +915,6 @@ Comment: Files: vendor/arrayvec/* - vendor/arrayvec-0.5.*/* vendor/either/* vendor/itertools/* vendor/maplit/* @@ -937,6 +986,11 @@ Copyright: 2016-2024 Henri Sivonen <hsivonen@hsivonen.fi> License: (Apache-2.0 OR MIT) AND BSD-3-Clause Comment: see https://github.com/hsivonen/encoding_rs +Files: vendor/erased-serde/* +Copyright: 2016-2024 David Tolnay <dtolnay@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/erased-serde + Files: vendor/errno/* Copyright: 2015-2022 Chris Wong <lambda.fairy@gmail.com> License: MIT or Apache-2.0 @@ -973,9 +1027,12 @@ Copyright: 2016-2019 Steven Fackler <sfackler@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/sfackler/rust-fallible-iterator -Files: - vendor/fastrand/* - vendor/fastrand-1.*/* +Files: vendor/faster-hex/* +Copyright: 2018-2023 zhangsoledad <787953403@qq.com> +License: MIT +Comment: see https://github.com/NervosFoundation/faster-hex + +Files: vendor/fastrand/* Copyright: 2020-2023 Stjepan Glavina <stjepang@gmail.com> License: Apache-2.0 OR MIT Comment: see https://github.com/smol-rs/fastrand @@ -1051,9 +1108,7 @@ Copyright: License: MIT Comment: see https://github.com/fizyk20/generic-array.git -Files: - vendor/gimli/* - vendor/gimli-*/* +Files: vendor/gimli/* Copyright: 2016-2021 Nick Fitzgerald <fitzgen@gmail.com> 2016-2021 Philip Craig <philipjcraig@gmail.com> @@ -1062,9 +1117,6 @@ Comment: see https://github.com/gimli-rs/gimli Files: - extra/git2/* - extra/git2-curl/* - extra/libgit2-sys/* vendor/git2/* vendor/git2-curl/* vendor/libgit2-sys/* @@ -1088,6 +1140,7 @@ Files: vendor/gix-diff/* vendor/gix-discover/* vendor/gix-features/* + vendor/gix-filter/* vendor/gix-fs/* vendor/gix-glob/* vendor/gix-hash/* @@ -1095,13 +1148,15 @@ Files: vendor/gix-ignore/* vendor/gix-index/* vendor/gix-lock/* - vendor/gix-mailmap/* + vendor/gix-macros/* vendor/gix-negotiate/* vendor/gix-object/* vendor/gix-odb/* vendor/gix-pack/* vendor/gix-packetline/* + vendor/gix-packetline-blocking/* vendor/gix-path/* + vendor/gix-pathspec/* vendor/gix-prompt/* vendor/gix-protocol/* vendor/gix-quote/* @@ -1110,7 +1165,9 @@ Files: vendor/gix-revision/* vendor/gix-revwalk/* vendor/gix-sec/* + vendor/gix-submodule/* vendor/gix-tempfile/* + vendor/gix-trace/* vendor/gix-transport/* vendor/gix-traverse/* vendor/gix-url/* @@ -1118,8 +1175,9 @@ Files: vendor/gix-validate/* vendor/gix-worktree/* Copyright: - 2018-2024 Sebastian Thiel <sebastian.thiel@icloud.com> 2018-2024 Conor Davis <gitoxide@conor.fastmail.fm> + 2018-2024 Jiahao XU <Jiahao_XU@outlook.com> + 2018-2024 Sebastian Thiel <sebastian.thiel@icloud.com> License: MIT or Apache-2.0 Comment: see https://github.com/Byron/gitoxide @@ -1263,11 +1321,6 @@ Copyright: 2017-2021 Ted Driggs <ted.driggs@outlook.com> License: MIT or Apache-2.0 Comment: see https://github.com/TedDriggs/ident_case -Files: vendor/imara-diff/* -Copyright: 2022-2023 pascalkuthe <pascalkuthe@semimod.de> -License: Apache-2.0 -Comment: see https://github.com/pascalkuthe/imara-diff - Files: vendor/im-rc/* Copyright: 2017-2022 Bodil Stokke <bodil@bodil.org> License: MPL-2.0+ @@ -1303,11 +1356,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-close/* -Copyright: 2020-2021 wufz -License: MIT OR Apache-2.0 -Comment: see https://gitlab.com/wufz/io-close - 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 @@ -1377,11 +1425,6 @@ 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 @@ -1406,6 +1449,11 @@ Copyright: 2016-2022 Nick Fitzgerald <fitzgen@gmail.com> License: Apache-2.0 or MIT Comment: see https://github.com/gimli-rs/leb128 +Files: vendor/levenshtein/* +Copyright: 2016-2021 Titus Wormer <tituswormer@gmail.com> +License: MIT +Comment: see https://github.com/wooorm/levenshtein-rs + Files: vendor/libloading/* vendor/libloading-0.7.4/* @@ -1447,6 +1495,11 @@ Copyright: 2021-2022 Dan Gohman <dev@sunfishcode.online> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT Comment: see https://github.com/sunfishcode/linux-raw-sys +Files: vendor/lsp-server/* +Copyright: 2024 rust-analyzer team +License: MIT OR Apache-2.0 +Comment: see https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server + Files: vendor/lsp-types/* Copyright: 2016-2022 Markus Westerlind <marwes91@gmail.com> 2016-2022 Bruno Medeiros <bruno.do.medeiros@gmail.com> @@ -1562,9 +1615,12 @@ Copyright: 2015 Sean McArthur <sean.monstar@gmail.com> License: MIT Comment: see https://github.com/seanmonstar/num_cpus -Files: - vendor/object/* - vendor/object-0.*/* +Files: vendor/number_prefix/* +Copyright: 2014-2020 Benjamin Sago <ogham@bsago.me> +License: MIT +Comment: see https://github.com/ogham/rust-number-prefix + +Files: vendor/object/* Copyright: 2016-2020 Nick Fitzgerald <fitzgen@gmail.com> 2016-2020 Philip Craig <philipjcraig@gmail.com> @@ -1663,6 +1719,10 @@ Copyright: 2018-2021 Gonzalo Brito Gadeschi <gonzalobg88@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang-nursery/packed_simd +Files: vendor/pad/* +Copyright: 2018-2024 Ben S <ogham@bsago.me> +License: MIT + Files: vendor/partial_ref/* vendor/partial_ref_derive/* @@ -1728,6 +1788,11 @@ Copyright: 2019-2024 Hao Hou <haohou302@gmail.com> License: MIT Comment: see https://github.com/plotters-rs/plotters +Files: vendor/portable-atomic/* +Copyright: 2022 Taiki Endo +License: Apache-2.0 OR MIT +Comment: see https://github.com/taiki-e/portable-atomic + Files: vendor/precomputed-hash/* Copyright: 2017-2017 Emilio Cobos Álvarez <emilio@crisal.io> License: MIT @@ -1740,6 +1805,11 @@ Copyright: 2017-2022 Colin Kiegel <kiegel@gmx.de> License: MIT or Apache-2.0 Comment: see https://github.com/colin-kiegel/rust-pretty-assertions +Files: vendor/prettydiff/* +Copyright: 2019-2024 Roman Koblov <penpen938@me.com> +License: MIT +Comment: see https://github.com/romankoblov/prettydiff + Files: vendor/proc-macro-hack/* Copyright: 2016-2022 David Tolnay <dtolnay@gmail.com> License: MIT OR Apache-2.0 @@ -1796,6 +1866,18 @@ Comment: see https://github.com/rayon-rs/rayon see https://github.com/Zoxc/rayon/tree/rustc +Files: vendor/r-efi/* +Copyright: 2018-2024 David Rheinsberg <david.rheinsberg@gmail.com> + 2018-2024 Tom Gundersen <teg@jklm.no> +License: MIT OR Apache-2.0 OR LGPL-2.1-or-later +Comment: see https://github.com/r-efi/r-efi + +Files: vendor/r-efi-alloc/* +Copyright: 2018-2022 David Rheinsberg <david.rheinsberg@gmail.com> + 2018-2022 Tom Gundersen <teg@jklm.no> +License: MIT OR Apache-2.0 OR LGPL-2.1-or-later +Comment: see https://github.com/r-efi/r-efi-alloc + Files: vendor/redox_users/* Copyright: 2017-2021 Jose Narvaez <goyox86@gmail.com> 2017-2021 Wesley Hershberger <mggmugginsmc@gmail.com> @@ -1812,7 +1894,8 @@ Comment: Files: vendor/regex-automata/* - vendor/regex-automata-0.1.10/* + vendor/regex-automata-0.1.*/* + vendor/regex-automata-0.2.*/* Copyright: 2018-2020 Andrew Gallant <jamslam@gmail.com> License: Unlicense or MIT Comment: see https://github.com/BurntSushi/regex-automata @@ -1942,6 +2025,11 @@ Copyright: License: MIT or Apache-2.0 Comment: see https://github.com/toml-rs/toml +Files: vendor/serde-untagged/* +Copyright: 2023-2024 David Tolnay <dtolnay@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/dtolnay/serde-untagged + Files: vendor/serde_urlencoded/* Copyright: 2016-2024 Anthony Ramine <n.oxyde@gmail.com> License: MIT or Apache-2.0 @@ -1972,14 +2060,6 @@ Copyright: 2015-2015 comex <comexk@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/comex/rust-shlex -Files: - vendor/signal-hook/* - vendor/signal-hook-registry/* -Copyright: 2018-2024 Michal 'vorner' Vaner <vorner@vorner.cz> - 2018-2024 Thomas Himmelstoss <thimm@posteo.de> -License: Apache-2.0 or MIT -Comment: see https://github.com/vorner/signal-hook - Files: vendor/similar/* Copyright: 2021-2024 Armin Ronacher <armin.ronacher@active-4.com> 2021-2024 Pierre-Étienne Meunier <pe@pijul.org> @@ -2050,11 +2130,6 @@ Copyright: 2017-2020 Nikolai Vazquez License: MIT OR Apache-2.0 Comment: see https://github.com/nvzqz/static-assertions-rs -Files: vendor/strip-ansi-escapes/* -Copyright: 2017-2023 Ted Mielczarek <ted@mielczarek.org> -License: Apache-2.0 or MIT -Comment: see https://github.com/luser/strip-ansi-escapes - Files: vendor/strsim/* Copyright: 2015-2021 Danny Guo <dannyguo91@gmail.com> License: MIT @@ -2088,6 +2163,11 @@ Copyright: 2015-2022 Guillaume Gomez <guillaume1.gomez@gmail.com> License: MIT Comment: see https://github.com/GuillaumeGomez/sysinfo +Files: vendor/tar-0.4.38/* +Copyright: 2014-2023 Alex Crichton <alex@alexcrichton.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/alexcrichton/tar-rs + Files: vendor/tempfile/* Copyright: 2015-2018 Steven Allen <steven@stebalien.com> 2015-2018 The Rust Project Developers @@ -2255,7 +2335,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/* +Files: vendor/ui_test-0.*/* Copyright: 2010-2024 The Rust Project Developers 2015-2024 Thomas Bracht Laumann Jespersen <laumann.thomas@gmail.com> @@ -2292,6 +2372,11 @@ Copyright: 2018-2022 Jannis Harder <me@jix.one> License: MIT or Apache-2.0 Comment: see https://github.com/jix/varisat +Files: vendor/vcpkg/* +Copyright: 2017-2024 Jim McGrath <jimmc2@gmail.com> +License: MIT or Apache-2.0 +Comment: see https://github.com/mcgoo/vcpkg-rs + Files: vendor/vec_mut_scan/* Copyright: 2019-2023 Jannis Harder <me@jix.one> License: 0BSD @@ -2302,17 +2387,6 @@ Copyright: 2017-2019 Sergio Benitez <sb@sergio.bz> License: MIT or Apache-2.0 Comment: see https://github.com/SergioBenitez/version_check -Files: vendor/vte/* -Copyright: 2016-2024 Joe Wilm <joe@jwilm.com> - 2016-2024 Christian Duerr <contact@christianduerr.com> -License: Apache-2.0 OR MIT -Comment: see https://github.com/alacritty/vte - -Files: vendor/vte_generate_state_changes/* -Copyright: 2016-2024 Christian Duerr <contact@christianduerr.com> -License: Apache-2.0 OR MIT -Comment: see https://github.com/jwilm/vte - Files: vendor/want/* Copyright: 2018-2023 Sean McArthur <sean@seanmonstar.com> License: MIT @@ -2416,20 +2490,18 @@ Copyright: 2019-2020 The Cranelift Project Developers License: Apache-2.0 with LLVM exception or Apache-2.0 or MIT Comment: see https://github.com/CraneStation/rust-wasi -Files: - vendor/windows-bindgen/* - vendor/windows-tokens/* +Files: vendor/windows-bindgen/* Copyright: 2019-2024 Microsoft License: MIT OR Apache-2.0 Comment: see https://github.com/microsoft/windows-rs + this contains pre-generated files which are also MIT or Apache-2.0 licensed, + see vendor/windows-bindgen/default/readme.md Files: vendor/windows-metadata/* Copyright: Microsoft 2024 License: MIT or Apache-2.0 Comment: see https://github.com/microsoft/windows-rs - this contains pre-generated files which are also MIT or Apache-2.0 licensed, - see vendor/windows-metadata/default/readme.md Files: vendor/winnow/* Copyright: diff --git a/debian/gbp.conf b/debian/gbp.conf index a1da765a3..d26455b68 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = True ignore-branch = True -component = extra +#component = extra [import-orig] upstream-branch = upstream/experimental diff --git a/debian/libstd-rust-1.73.lintian-overrides b/debian/libstd-rust-1.73.lintian-overrides deleted file mode 100644 index 87e0de4a8..000000000 --- a/debian/libstd-rust-1.73.lintian-overrides +++ /dev/null @@ -1,16 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.73 binary: package-name-doesnt-match-sonames -libstd-rust-1.73 binary: sharedobject-in-library-directory-missing-soname - -# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff -libstd-rust-1.73 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.73 binary: shlib-without-versioned-soname -libstd-rust-1.73 binary: unused-shlib-entry-in-control-file - -# can trigger if all its so files' hashes start with a latter and not a digit -libstd-rust-1.73 binary: empty-shlibs - -# Libraries that use libc symbols (libterm, libstd, etc) *are* linked -# to libc. Lintian gets upset that some Rust libraries don't need -# libc, boo hoo. -libstd-rust-1.73 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.73.install b/debian/libstd-rust-1.74.install index cd4545cca..cd4545cca 100644 --- a/debian/libstd-rust-1.73.install +++ b/debian/libstd-rust-1.74.install diff --git a/debian/libstd-rust-1.74.lintian-overrides b/debian/libstd-rust-1.74.lintian-overrides new file mode 100644 index 000000000..db96cfcf8 --- /dev/null +++ b/debian/libstd-rust-1.74.lintian-overrides @@ -0,0 +1,16 @@ +# "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.73.triggers b/debian/libstd-rust-1.74.triggers index a88c20f92..a88c20f92 100644 --- a/debian/libstd-rust-1.73.triggers +++ b/debian/libstd-rust-1.74.triggers diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch index a3f7d112d..76f158538 100644 --- a/debian/patches/c-2002_disable-net-tests.patch +++ b/debian/patches/c-2002_disable-net-tests.patch @@ -222,8 +222,8 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_implicitly_to_only_allowed_registry() { let _registry = RegistryBuilder::new() .http_api() -@@ -921,7 +921,7 @@ You may press ctrl-c [..] - ); +@@ -963,7 +963,7 @@ fn publish_failed_with_index_and_only_al + .run(); } -#[cargo_test] @@ -231,7 +231,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_fail_with_no_registry_specified() { let p = project().build(); -@@ -955,7 +955,7 @@ The registry `crates-io` is not listed i +@@ -997,7 +997,7 @@ The registry `crates-io` is not listed i .run(); } @@ -240,7 +240,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn block_publish_no_registry() { let p = project() .file( -@@ -985,7 +985,7 @@ fn block_publish_no_registry() { +@@ -1027,7 +1027,7 @@ fn block_publish_no_registry() { } // Explicitly setting `crates-io` in the publish list. @@ -249,7 +249,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_crates_io_explicit() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1038,7 +1038,7 @@ You may press ctrl-c [..] +@@ -1080,7 +1080,7 @@ You may press ctrl-c [..] .run(); } @@ -258,7 +258,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_select_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1089,7 +1089,7 @@ You may press ctrl-c [..] +@@ -1131,7 +1131,7 @@ You may press ctrl-c [..] .run(); } @@ -267,7 +267,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_all_features() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1140,7 +1140,7 @@ You may press ctrl-c [..] +@@ -1182,7 +1182,7 @@ You may press ctrl-c [..] .run(); } @@ -276,7 +276,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_no_default_features() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1176,7 +1176,7 @@ fn publish_with_no_default_features() { +@@ -1218,7 +1218,7 @@ fn publish_with_no_default_features() { .run(); } @@ -285,7 +285,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_patch() { let registry = RegistryBuilder::new().http_api().http_index().build(); Package::new("bar", "1.0.0").publish(); -@@ -1282,7 +1282,7 @@ You may press ctrl-c [..] +@@ -1324,7 +1324,7 @@ You may press ctrl-c [..] ); } @@ -294,7 +294,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_checks_for_token_before_verify() { let registry = registry::RegistryBuilder::new() .no_configure_token() -@@ -1331,7 +1331,7 @@ fn publish_checks_for_token_before_verif +@@ -1373,7 +1373,7 @@ fn publish_checks_for_token_before_verif .run(); } @@ -303,7 +303,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_bad_source() { let p = project() .file( -@@ -1380,7 +1380,7 @@ include `--registry crates-io` to use cr +@@ -1422,7 +1422,7 @@ include `--registry crates-io` to use cr } // A dependency with both `git` and `version`. @@ -312,7 +312,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_git_with_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -1524,7 +1524,7 @@ You may press ctrl-c [..] +@@ -1566,7 +1566,7 @@ You may press ctrl-c [..] ); } @@ -321,7 +321,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_dev_dep_no_version() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -1614,7 +1614,7 @@ repository = "foo" +@@ -1656,7 +1656,7 @@ repository = "foo" ); } @@ -330,7 +330,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn credentials_ambiguous_filename() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -1670,7 +1670,7 @@ You may press ctrl-c [..] +@@ -1712,7 +1712,7 @@ You may press ctrl-c [..] // --index will not load registry.token to avoid possibly leaking // crates.io token to another server. @@ -339,7 +339,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn index_requires_token() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1705,7 +1705,7 @@ fn index_requires_token() { +@@ -1747,7 +1747,7 @@ fn index_requires_token() { } // publish with source replacement without --registry @@ -348,7 +348,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn cratesio_source_replacement() { registry::init(); let p = project() -@@ -1734,7 +1734,7 @@ include `--registry dummy-registry` or ` +@@ -1776,7 +1776,7 @@ include `--registry dummy-registry` or ` .run(); } @@ -357,7 +357,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn publish_with_missing_readme() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -1782,7 +1782,7 @@ Caused by: +@@ -1824,7 +1824,7 @@ Caused by: } // Registry returns an API error. @@ -366,7 +366,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_json() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1830,7 +1830,7 @@ Caused by: +@@ -1872,7 +1872,7 @@ Caused by: } // Registry returns an API error with a 200 status code. @@ -375,7 +375,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_200() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1878,7 +1878,7 @@ Caused by: +@@ -1920,7 +1920,7 @@ Caused by: } // Registry returns an error code without a JSON message. @@ -384,7 +384,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_error_code() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1932,7 +1932,7 @@ Caused by: +@@ -1975,7 +1975,7 @@ Caused by: } // Registry has a network error. @@ -393,7 +393,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_curl_error() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -1982,7 +1982,7 @@ Caused by: +@@ -2025,7 +2025,7 @@ Caused by: } // Registry returns an invalid response. @@ -402,7 +402,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn api_other_error() { let _registry = registry::RegistryBuilder::new() .alternative() -@@ -2032,7 +2032,7 @@ Caused by: +@@ -2075,7 +2075,7 @@ Caused by: .run(); } @@ -411,7 +411,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -2084,7 +2084,7 @@ You may press ctrl-c [..] +@@ -2127,7 +2127,7 @@ You may press ctrl-c [..] validate_upload_li(); } @@ -420,7 +420,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn with_duplicate_spec_in_members() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2136,7 +2136,7 @@ fn with_duplicate_spec_in_members() { +@@ -2179,7 +2179,7 @@ fn with_duplicate_spec_in_members() { .run(); } @@ -429,7 +429,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_with_members_with_features_old() { let registry = RegistryBuilder::new().http_api().http_index().build(); -@@ -2187,7 +2187,7 @@ You may press ctrl-c [..] +@@ -2230,7 +2230,7 @@ You may press ctrl-c [..] validate_upload_li(); } @@ -438,7 +438,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_virtual_workspace() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2223,7 +2223,7 @@ fn in_virtual_workspace() { +@@ -2266,7 +2266,7 @@ fn in_virtual_workspace() { .run(); } @@ -447,7 +447,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_virtual_workspace_with_p() { // `publish` generally requires a remote registry let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -2281,7 +2281,7 @@ You may press ctrl-c [..] +@@ -2324,7 +2324,7 @@ You may press ctrl-c [..] .run(); } @@ -456,7 +456,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_not_found() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2326,7 +2326,7 @@ error: package ID specification `li` did +@@ -2369,7 +2369,7 @@ error: package ID specification `li` did .run(); } @@ -465,7 +465,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn in_package_workspace_found_multiple() { // Use local registry for faster test times since no publish will occur let registry = registry::init(); -@@ -2383,7 +2383,7 @@ error: the `-p` argument must be specifi +@@ -2426,7 +2426,7 @@ error: the `-p` argument must be specifi .run(); } @@ -474,7 +474,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs // https://github.com/rust-lang/cargo/issues/10536 fn publish_path_dependency_without_workspace() { // Use local registry for faster test times since no publish will occur -@@ -2430,7 +2430,7 @@ error: package ID specification `bar` di +@@ -2473,7 +2473,7 @@ error: package ID specification `bar` di .run(); } @@ -483,7 +483,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn http_api_not_noop() { let registry = registry::RegistryBuilder::new().http_api().build(); -@@ -2491,7 +2491,7 @@ You may press ctrl-c [..] +@@ -2534,7 +2534,7 @@ You may press ctrl-c [..] p.cargo("build").run(); } @@ -492,7 +492,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_first_publish() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2573,7 +2573,7 @@ You may press ctrl-c to skip waiting; th +@@ -2616,7 +2616,7 @@ You may press ctrl-c to skip waiting; th /// A separate test is needed for package names with - or _ as they hit /// the responder twice per cargo invocation. If that ever gets changed /// this test will need to be changed accordingly. @@ -501,7 +501,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_first_publish_underscore() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2669,7 +2669,7 @@ You may press ctrl-c to skip waiting; th +@@ -2712,7 +2712,7 @@ You may press ctrl-c to skip waiting; th p.cargo("build").with_status(0).run(); } @@ -510,7 +510,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs fn wait_for_subsequent_publish() { // Counter for number of tries before the package is "published" let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); -@@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th +@@ -2804,7 +2804,7 @@ You may press ctrl-c to skip waiting; th p.cargo("check").with_status(0).run(); } @@ -523,16 +523,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs +++ rust/src/tools/cargo/tests/testsuite/credential_process.rs -@@ -7,7 +7,7 @@ fn toml_bin(proj: &Project, name: &str) - proj.bin(name).display().to_string().replace('\\', "\\\\") - } - --#[cargo_test] -+#[allow(dead_code)] - fn gated() { - let _alternative = registry::RegistryBuilder::new() - .alternative() -@@ -120,7 +120,7 @@ fn get_token_test() -> (Project, TestReg +@@ -63,7 +63,7 @@ fn get_token_test() -> (Project, TestReg (p, server) } @@ -541,7 +532,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn publish() { // Checks that credential-process is used for `cargo publish`. let (p, _t) = get_token_test(); -@@ -143,7 +143,7 @@ You may press ctrl-c [..] +@@ -85,7 +85,7 @@ You may press ctrl-c [..] .run(); } @@ -550,7 +541,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn basic_unsupported() { // Non-action commands don't support login/logout. let registry = registry::RegistryBuilder::new() -@@ -181,7 +181,7 @@ Caused by: +@@ -121,7 +121,7 @@ Caused by: .run(); } @@ -559,7 +550,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn login() { let registry = registry::RegistryBuilder::new() .no_configure_token() -@@ -203,7 +203,7 @@ fn login() { +@@ -142,7 +142,7 @@ fn login() { .run(); } @@ -568,7 +559,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn logout() { let server = registry::RegistryBuilder::new() .no_configure_token() -@@ -223,7 +223,7 @@ fn logout() { +@@ -161,7 +161,7 @@ fn logout() { .run(); } @@ -577,7 +568,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn yank() { let (p, _t) = get_token_test(); -@@ -239,7 +239,7 @@ fn yank() { +@@ -176,7 +176,7 @@ fn yank() { .run(); } @@ -586,7 +577,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn owner() { let (p, _t) = get_token_test(); -@@ -255,7 +255,7 @@ fn owner() { +@@ -191,7 +191,7 @@ fn owner() { .run(); } diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch deleted file mode 100644 index c1d59a40a..000000000 --- a/debian/patches/c-update-libgit2.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: rust/src/tools/cargo/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/Cargo.toml -+++ rust/src/tools/cargo/Cargo.toml -@@ -37,8 +37,8 @@ curl-sys = "0.4.65" - filetime = "0.2.21" - flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] } - fwdansi = "1.1.0" --git2 = "0.17.2" --git2-curl = "0.18.0" -+git2 = "0.18" -+git2-curl = "0.19.0" - gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } - gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } - glob = "0.3.1" -@@ -56,7 +56,7 @@ jobserver = "0.1.26" - lazy_static = "1.4.0" - lazycell = "1.3.0" - libc = "0.2.147" --libgit2-sys = "0.15.2" -+libgit2-sys = "0.16.1" - libloading = "0.8.0" - memchr = "2.5.0" - miow = "0.6.0" -Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml -=================================================================== ---- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml -+++ rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml -@@ -15,7 +15,7 @@ cargo-util = { path = "../cargo-util" } - crates-io = { path = "../crates-io" } - filetime = "0.2" - flate2 = { version = "1.0", default-features = false, features = ["zlib"] } --git2 = "0.17.0" -+git2 = "0.18.0" - glob = "0.3" - itertools = "0.10.0" - lazy_static = "1.0" diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 3542cd9c5..2002ea30d 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -11,7 +11,7 @@ Subject: d-0000-ignore-removed-submodules 5 files changed, 24 insertions(+), 64 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index d2e84d5..a852385 100644 +index 9b11ae8..19a98f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,22 +19,15 @@ members = [ @@ -38,10 +38,10 @@ index d2e84d5..a852385 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index f44a05a..27da09c 100644 +index fac0cdf..6fa1e9e 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -944,10 +944,6 @@ class RustBuild(object): +@@ -962,10 +962,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] args.extend("--verbose" for _ in range(self.verbose)) @@ -53,10 +53,10 @@ index f44a05a..27da09c 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index b366619..8866581 100644 +index 46a62ee..216158c 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -497,20 +497,20 @@ impl<'a> ShouldRun<'a> { +@@ -499,20 +499,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +89,7 @@ index b366619..8866581 100644 submodules_paths }; -@@ -684,25 +684,14 @@ impl<'a> Builder<'a> { +@@ -686,25 +686,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -112,10 +112,10 @@ index b366619..8866581 100644 - llvm::Lld, - llvm::CrtBeginEnd, - tool::RustdocGUITest, - tool::OptimizedDist + tool::OptimizedDist, + tool::CoverageDump, ), - Kind::Check | Kind::Clippy | Kind::Fix => describe!( -@@ -711,12 +700,7 @@ impl<'a> Builder<'a> { +@@ -714,12 +703,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -128,7 +128,7 @@ index b366619..8866581 100644 check::Bootstrap ), Kind::Test => describe!( -@@ -745,7 +729,6 @@ impl<'a> Builder<'a> { +@@ -750,7 +734,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -136,7 +136,7 @@ index b366619..8866581 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -761,7 +744,6 @@ impl<'a> Builder<'a> { +@@ -766,7 +749,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -144,7 +144,7 @@ index b366619..8866581 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -798,7 +780,6 @@ impl<'a> Builder<'a> { +@@ -803,7 +785,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -152,7 +152,7 @@ index b366619..8866581 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -816,12 +797,9 @@ impl<'a> Builder<'a> { +@@ -821,12 +802,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -165,7 +165,7 @@ index b366619..8866581 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -838,11 +816,9 @@ impl<'a> Builder<'a> { +@@ -843,11 +821,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -177,7 +177,7 @@ index b366619..8866581 100644 install::LlvmTools, install::Src, install::Rustc -@@ -852,7 +828,6 @@ impl<'a> Builder<'a> { +@@ -857,7 +833,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -185,7 +185,7 @@ index b366619..8866581 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1990,10 +1965,7 @@ impl<'a> Builder<'a> { +@@ -1998,10 +1973,7 @@ impl<'a> Builder<'a> { } } @@ -198,10 +198,10 @@ index b366619..8866581 100644 } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index d0d62db..3c4c4e3 100644 +index ba030f0..ba2e669 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -2143,17 +2143,7 @@ impl Step for RustcGuide { +@@ -2167,17 +2167,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -221,7 +221,7 @@ index d0d62db..3c4c4e3 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index f6a50bf..bd38d4f 100644 +index cab88fc..5bac437 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index a947d676b..ea3975d6f 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 41003ad..0578f7b 100644 +index dcb165f..e211d6f 100644 --- a/compiler/rustc/Cargo.toml +++ b/compiler/rustc/Cargo.toml -@@ -14,13 +14,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } - # crate is intended to be used by stable MIR consumers, which are not in-tree +@@ -15,13 +15,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } rustc_smir = { path = "../rustc_smir" } + stable_mir = { path = "../stable_mir" } -[dependencies.jemalloc-sys] -version = "0.5.0" 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 1e8c91ca6..cc0ab7881 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -8,7 +8,7 @@ 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 0e189a6..4071e8c 100644 +index 4403044..23c5cc7 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -217,7 +217,5 @@ test = false diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch index ef2fe174f..e5d78db0c 100644 --- a/debian/patches/d-0011-cargo-remove-nghttp2.patch +++ b/debian/patches/d-0011-cargo-remove-nghttp2.patch @@ -8,7 +8,7 @@ Last-Update: 2023-05-17 <YYYY-MM-DD, last update of the meta-information, option 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index 174d6eb..ffa79ac 100644 +index 9149121..b36d525 100644 --- a/vendor/curl-sys/Cargo.toml +++ b/vendor/curl-sys/Cargo.toml @@ -52,7 +52,7 @@ version = "0.3.3" diff --git a/debian/patches/d-0012-cargo-always-return-dev-channel.patch b/debian/patches/d-0012-cargo-always-return-dev-channel.patch index e30e2a40d..86e67ed75 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 9b99d5a..980f94a 100644 +index 5faa208..eefbf78 100644 --- a/src/tools/cargo/src/cargo/core/features.rs +++ b/src/tools/cargo/src/cargo/core/features.rs -@@ -1215,9 +1215,8 @@ pub fn channel() -> String { +@@ -1212,9 +1212,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 3bb0bdcb8..cc3514750 100644 --- a/debian/patches/d-0020-remove-windows-dependencies.patch +++ b/debian/patches/d-0020-remove-windows-dependencies.patch @@ -4,23 +4,24 @@ 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 | 20 ++--------- - .../cargo/crates/cargo-test-support/Cargo.toml | 41 ++++++++++------------ - src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ---- - src/tools/cargo/crates/home/Cargo.toml | 3 -- - .../cargo/credential/cargo-credential/Cargo.toml | 3 -- - src/tools/compiletest/Cargo.toml | 10 ------ - src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 -- - .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ---- - src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 --- - 16 files changed, 22 insertions(+), 138 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 | 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(-) diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index 34d0e2d..2cb22f0 100644 @@ -106,10 +107,10 @@ index e26d25d..fe343f8 100644 - "Win32_System_LibraryLoader", -] diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml -index cff2c9e..ad053f0 100644 +index 6714b3b..71d56b4 100644 --- a/library/backtrace/Cargo.toml +++ b/library/backtrace/Cargo.toml -@@ -45,9 +45,6 @@ version = "0.31.1" +@@ -47,9 +47,6 @@ version = "0.32.0" default-features = false features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] @@ -119,7 +120,7 @@ index cff2c9e..ad053f0 100644 [build-dependencies] # Only needed for Android, but cannot be target dependent # https://github.com/rust-lang/cargo/issues/4932 -@@ -85,16 +82,6 @@ libbacktrace = [] +@@ -87,16 +84,6 @@ libbacktrace = [] libunwind = [] unix-backtrace = [] verify-winapi = [ @@ -137,7 +138,7 @@ index cff2c9e..ad053f0 100644 [[example]] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml -index 74b9a23..e65e3c2 100644 +index 9bf2694..9fc6f66 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -62,21 +62,6 @@ semver = "1.0.17" @@ -160,10 +161,10 @@ index 74b9a23..e65e3c2 100644 -] - [dev-dependencies] - pretty_assertions = "1.2" + pretty_assertions = "1.4" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 4071e8c..1f8164f 100644 +index 23c5cc7..91ecfd0 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -2,7 +2,9 @@ @@ -177,39 +178,36 @@ index 4071e8c..1f8164f 100644 "benches/benchsuite", "benches/capture", ] -@@ -21,8 +23,6 @@ bytesize = "1.2" +@@ -24,8 +26,6 @@ bytesize = "1.3" cargo = { path = "" } - cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" } + 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-platform = { path = "crates/cargo-platform", version = "0.1.4" } cargo-test-macro = { path = "crates/cargo-test-macro" } cargo-test-support = { path = "crates/cargo-test-support" } -@@ -100,7 +100,6 @@ unicode-xid = "0.2.4" - url = "2.4.0" +@@ -101,7 +101,6 @@ unicode-xid = "0.2.4" + url = "2.4.1" varisat = "0.2.2" walkdir = "2.3.3" -windows-sys = "0.48" [package] name = "cargo" -@@ -125,8 +124,6 @@ bytesize.workspace = true +@@ -128,8 +127,6 @@ bytesize.workspace = true cargo-platform.workspace = true cargo-credential.workspace = true cargo-credential-libsecret.workspace = true -cargo-credential-macos-keychain.workspace = true -cargo-credential-wincred.workspace = true cargo-util.workspace = true + color-print.workspace = true clap = { workspace = true, features = ["wrap_help"] } - crates-io.workspace = true -@@ -186,21 +183,6 @@ walkdir.workspace = true +@@ -189,18 +186,6 @@ walkdir.workspace = true [target.'cfg(not(windows))'.dependencies] openssl = { workspace = true, optional = true } --[target.'cfg(windows)'.dependencies] --fwdansi.workspace = true -- -[target.'cfg(windows)'.dependencies.windows-sys] -workspace = true -features = [ @@ -226,59 +224,21 @@ index 4071e8c..1f8164f 100644 cargo-test-macro.workspace = true cargo-test-support.workspace = true diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml -index 085041a..fa0e603 100644 +index fc32e1c..ce5d708 100644 --- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml +++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml -@@ -9,25 +9,22 @@ publish = false - doctest = false - - [dependencies] --anyhow.workspace = true --cargo-test-macro.workspace = true --cargo-util.workspace = true --crates-io.workspace = true --filetime.workspace = true --flate2.workspace = true --git2.workspace = true --glob.workspace = true --itertools.workspace = true --lazy_static.workspace = true --pasetors.workspace = true --serde = { workspace = true, features = ["derive"] } --serde_json.workspace = true --snapbox.workspace = true --tar.workspace = true --termcolor.workspace = true --time.workspace = true --toml.workspace = true --url.workspace = true +@@ -29,6 +29,3 @@ tar.workspace = true + time.workspace = true + toml.workspace = true + url.workspace = true - -[target.'cfg(windows)'.dependencies] -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] } -+anyhow = "1.0.34" -+cargo-test-macro = { path = "../cargo-test-macro" } -+cargo-util = { path = "../cargo-util" } -+crates-io = { path = "../crates-io" } -+filetime = "0.2" -+flate2 = { version = "1.0", default-features = false, features = ["zlib"] } -+git2 = "0.17.0" -+glob = "0.3" -+itertools = "0.10.0" -+lazy_static = "1.0" -+pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] } -+serde = { version = "1.0.123", features = ["derive"] } -+serde_json = "1.0" -+snapbox = { version = "0.4.0", features = ["diff", "path"] } -+tar = { version = "0.4.38", default-features = false } -+termcolor = "1.1.2" -+time = { version = "0.3", features = ["parsing", "formatting"]} -+toml = "0.7.0" -+url = "2.2.2" diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml -index 99a5942..39eb404 100644 +index cba00f9..fb52b6e 100644 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml -@@ -19,10 +19,3 @@ shell-escape.workspace = true +@@ -20,10 +20,3 @@ shell-escape.workspace = true tempfile.workspace = true tracing.workspace = true walkdir.workspace = true @@ -301,10 +261,10 @@ 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 8cd1348..84b30cf 100644 +index c8db996..96aa498 100644 --- a/src/tools/cargo/credential/cargo-credential/Cargo.toml +++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml -@@ -14,8 +14,5 @@ serde_json.workspace = true +@@ -15,8 +15,5 @@ serde_json.workspace = true thiserror.workspace = true time.workspace = true @@ -313,11 +273,24 @@ index 8cd1348..84b30cf 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 +--- 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( + } + "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"), + "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), +- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), +- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), + "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), + process => Box::new(CredentialProcessCredential::new(process)), + }; diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml -index ff1d5ce..61f7be4 100644 +index bb1fa6e..2735e1e 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml -@@ -27,13 +27,3 @@ anyhow = "1" +@@ -28,13 +28,3 @@ home = "0.5.5" [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -346,10 +319,10 @@ index fd98d85..8c1d1379 100644 cpu_profiler = [] diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -index 5bfac7e..04b23a1 100644 +index 7410f0a..d25b922 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -@@ -72,12 +72,6 @@ toolchain.workspace = true +@@ -71,12 +71,6 @@ toolchain.workspace = true vfs-notify.workspace = true vfs.workspace = true @@ -377,16 +350,3 @@ index 536f000..6ed37f5 100644 [features] # Uncomment to enable for the whole crate graph # default = [ "backtrace" ] -Index: rust/src/tools/cargo/src/cargo/util/auth/mod.rs -=================================================================== ---- rust.orig/src/tools/cargo/src/cargo/util/auth/mod.rs -+++ rust/src/tools/cargo/src/cargo/util/auth/mod.rs -@@ -456,8 +456,6 @@ fn credential_action( - "cargo:token" => Box::new(TokenCredential::new(config)), - "cargo:paseto" => Box::new(PasetoCredential::new(config)), - "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), -- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), -- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), - "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), - process => Box::new(CredentialProcessCredential::new(process)), - }; diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index d925753da..80cb21a53 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -7,64 +7,59 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> --- - vendor/android-tzdata/Cargo.toml | 1 + - vendor/anstream/Cargo.toml | 6 ---- - vendor/anstyle-query/Cargo.toml | 7 ----- - vendor/atty/Cargo.toml | 3 -- - vendor/backtrace/Cargo.toml | 13 --------- - vendor/chrono/Cargo.toml | 12 -------- - vendor/colored/Cargo.toml | 4 --- - vendor/curl-sys-0.4.63+curl-8.1.2/Cargo.toml | 10 ------- - vendor/curl-sys/Cargo.toml | 10 ------- - vendor/curl/Cargo.toml | 10 ------- - vendor/dirs-sys-next/Cargo.toml | 3 -- - vendor/dirs-sys/Cargo.toml | 3 -- - vendor/errno/Cargo.toml | 6 ---- - vendor/fd-lock/Cargo.toml | 8 ------ - vendor/filetime/Cargo.toml | 7 ----- - vendor/gix-sec/Cargo.toml | 12 -------- - vendor/home/Cargo.toml | 7 ----- - vendor/iana-time-zone/Cargo.toml | 4 --- - vendor/ignore/Cargo.toml | 3 -- - vendor/io-close/Cargo.toml | 3 -- - vendor/io-lifetimes/Cargo.toml | 13 --------- - vendor/is-terminal/Cargo.toml | 11 -------- - vendor/libloading-0.7.4/Cargo.toml | 6 ---- - vendor/libloading/Cargo.toml | 8 ------ - vendor/libssh2-sys/Cargo.toml | 8 ------ - vendor/libz-sys/Cargo.toml | 3 -- - vendor/mio/Cargo.toml | 11 -------- - vendor/native-tls/Cargo.toml | 3 -- - vendor/normpath/Cargo.toml | 10 ------- - vendor/nu-ansi-term/Cargo.toml | 10 ------- - vendor/opener-0.5.2/Cargo.toml | 4 --- - vendor/opener/Cargo.toml | 9 ------ - vendor/openssl-sys/Cargo.toml | 3 -- - vendor/os_info/Cargo.toml | 15 ---------- - vendor/parking_lot_core-0.8.6/Cargo.toml | 12 -------- - vendor/parking_lot_core/Cargo.toml | 3 -- - vendor/pretty_assertions-1.3.0/Cargo.toml | 6 ---- - vendor/reqwest/Cargo.toml | 3 -- - vendor/rustix-0.37.20/Cargo.toml | 16 ----------- - vendor/rustix-0.37.22/Cargo.toml | 16 ----------- - vendor/rustix/Cargo.toml | 17 ------------ - vendor/same-file/Cargo.toml | 2 -- - vendor/snapbox/Cargo.toml | 6 ---- - vendor/socket2/Cargo.toml | 8 ------ - vendor/stacker/Cargo.toml | 10 ------- - vendor/sysinfo-0.26.7/Cargo.toml | 38 -------------------------- - vendor/sysinfo/Cargo.toml | 41 ---------------------------- - vendor/tempfile-3.6.0/Cargo.toml | 7 ----- - vendor/tempfile/Cargo.toml | 7 ----- - vendor/term/Cargo.toml | 6 ---- - vendor/termcolor/Cargo.toml | 3 -- - vendor/terminal_size/Cargo.toml | 7 ----- - vendor/termize/Cargo.toml | 3 -- - vendor/tokio/Cargo.toml | 21 -------------- - vendor/uuid/Cargo.toml | 4 --- - vendor/walkdir/Cargo.toml | 3 -- - vendor/yansi-term/Cargo.toml | 3 -- - 57 files changed, 1 insertion(+), 487 deletions(-) + vendor/android-tzdata/Cargo.toml | 1 + + vendor/ansi_term/Cargo.toml | 3 --- + vendor/anstream/Cargo.toml | 7 ------ + vendor/anstyle-query/Cargo.toml | 7 ------ + vendor/atty/Cargo.toml | 3 --- + vendor/backtrace/Cargo.toml | 14 ----------- + vendor/chrono/Cargo.toml | 12 ---------- + vendor/colored/Cargo.toml | 7 ------ + 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/errno/Cargo.toml | 6 ----- + vendor/fd-lock/Cargo.toml | 8 ------- + vendor/filetime/Cargo.toml | 7 ------ + vendor/gix-sec/Cargo.toml | 12 ---------- + vendor/home/Cargo.toml | 7 ------ + vendor/iana-time-zone/Cargo.toml | 4 ---- + vendor/ignore/Cargo.toml | 3 --- + vendor/io-lifetimes/Cargo.toml | 13 ---------- + vendor/is-terminal/Cargo.toml | 11 --------- + vendor/libloading-0.7.4/Cargo.toml | 6 ----- + vendor/libloading/Cargo.toml | 8 ------- + vendor/libssh2-sys/Cargo.toml | 8 ------- + vendor/libz-sys/Cargo.toml | 3 --- + vendor/mio/Cargo.toml | 11 --------- + vendor/native-tls/Cargo.toml | 3 --- + vendor/nu-ansi-term/Cargo.toml | 10 -------- + vendor/opener-0.5.2/Cargo.toml | 4 ---- + vendor/opener/Cargo.toml | 9 ------- + vendor/os_info/Cargo.toml | 15 ------------ + vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- + vendor/parking_lot_core/Cargo.toml | 3 --- + vendor/reqwest/Cargo.toml | 3 --- + vendor/rustix/Cargo.toml | 17 ------------- + vendor/same-file/Cargo.toml | 2 -- + vendor/snapbox/Cargo.toml | 6 ----- + vendor/socket2/Cargo.toml | 8 ------- + vendor/stacker/Cargo.toml | 10 -------- + vendor/sysinfo-0.26.7/Cargo.toml | 38 ----------------------------- + vendor/sysinfo/Cargo.toml | 41 -------------------------------- + vendor/tempfile/Cargo.toml | 7 ------ + vendor/term/Cargo.toml | 6 ----- + vendor/termcolor/Cargo.toml | 3 --- + vendor/terminal_size/Cargo.toml | 7 ------ + vendor/termize/Cargo.toml | 3 --- + vendor/tokio-native-tls/Cargo.toml | 17 ------------- + vendor/tokio/Cargo.toml | 21 ---------------- + vendor/uuid/Cargo.toml | 4 ---- + vendor/walkdir/Cargo.toml | 3 --- + vendor/yansi-term/Cargo.toml | 3 --- + 56 files changed, 1 insertion(+), 489 deletions(-) Index: rust/vendor/android-tzdata/Cargo.toml =================================================================== @@ -75,20 +70,32 @@ Index: rust/vendor/android-tzdata/Cargo.toml [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 +@@ -38,6 +38,3 @@ version = "1.0.39" + + [features] + derive_serde_style = ["serde"] +-[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 -@@ -136,10 +136,4 @@ auto = [ +@@ -131,11 +131,4 @@ auto = [ ] default = [ "auto", - "wincon", ] +-test = [] -wincon = ["dep:anstyle-wincon"] - -[target."cfg(windows)".dependencies.anstyle-wincon] --version = "1.0.1" +-version = "3.0.1" -optional = true Index: rust/vendor/anstyle-query/Cargo.toml =================================================================== @@ -122,7 +129,7 @@ Index: rust/vendor/backtrace/Cargo.toml =================================================================== --- rust.orig/vendor/backtrace/Cargo.toml +++ rust/vendor/backtrace/Cargo.toml -@@ -127,18 +127,5 @@ serialize-serde = ["serde"] +@@ -104,16 +104,6 @@ serialize-serde = ["serde"] std = [] unix-backtrace = [] verify-winapi = [ @@ -138,6 +145,12 @@ Index: rust/vendor/backtrace/Cargo.toml - "winapi/winnt", ] + [target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line] +@@ -139,7 +129,3 @@ features = [ + "archive", + ] + default-features = false +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -optional = true @@ -172,31 +185,50 @@ Index: rust/vendor/colored/Cargo.toml =================================================================== --- rust.orig/vendor/colored/Cargo.toml +++ rust/vendor/colored/Cargo.toml -@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3" +@@ -42,10 +42,3 @@ version = "=1.0.0-beta.3" [features] no-color = [] --[target."cfg(windows)".dependencies.winapi] +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +-] +Index: rust/vendor/console/Cargo.toml +=================================================================== +--- rust.orig/vendor/console/Cargo.toml ++++ rust/vendor/console/Cargo.toml +@@ -59,14 +59,3 @@ default = [ + ] + windows-console-colors = ["ansi-parsing"] + +-[target."cfg(windows)".dependencies.encode_unicode] -version = "0.3" --features = ["consoleapi", "processenv", "winbase"] --default-features = false +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +- "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 -@@ -73,16 +73,6 @@ zlib-ng-compat = [ +@@ -73,13 +73,6 @@ zlib-ng-compat = [ version = "0.9.64" optional = true -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2" - --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = [ -- "winsock2", -- "ws2def", --] +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Networking_WinSock"] - [badges.appveyor] repository = "alexcrichton/curl-rust" @@ -280,7 +312,7 @@ Index: rust/vendor/filetime/Cargo.toml =================================================================== --- rust.orig/vendor/filetime/Cargo.toml +++ rust/vendor/filetime/Cargo.toml -@@ -38,10 +38,3 @@ version = "0.2.9" +@@ -38,10 +38,3 @@ version = "0.3.5" [target."cfg(unix)".dependencies.libc] version = "0.2.27" @@ -300,7 +332,7 @@ Index: rust/vendor/gix-sec/Cargo.toml version = "0.2.123" -[target."cfg(windows)".dependencies.gix-path] --version = "^0.8.1" +-version = "^0.10.0" - -[target."cfg(windows)".dependencies.windows] -version = "0.48" @@ -349,17 +381,6 @@ Index: rust/vendor/ignore/Cargo.toml - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.2" -Index: rust/vendor/io-close/Cargo.toml -=================================================================== ---- rust.orig/vendor/io-close/Cargo.toml -+++ rust/vendor/io-close/Cargo.toml -@@ -28,6 +28,3 @@ optional = true - version = "3.1.0" - [target."cfg(unix)".dependencies.libc] - version = "0.2.80" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.9" --features = ["handleapi", "std", "winsock2"] Index: rust/vendor/io-lifetimes/Cargo.toml =================================================================== --- rust.orig/vendor/io-lifetimes/Cargo.toml @@ -378,7 +399,7 @@ Index: rust/vendor/io-lifetimes/Cargo.toml optional = true - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.48.0" +-version = "0.45.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", @@ -566,17 +587,6 @@ Index: rust/vendor/opener/Cargo.toml [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -Index: rust/vendor/openssl-sys/Cargo.toml -=================================================================== ---- rust.orig/vendor/openssl-sys/Cargo.toml -+++ rust/vendor/openssl-sys/Cargo.toml -@@ -56,6 +56,3 @@ version = "0.3.9" - [features] - unstable_boringssl = ["bssl-sys"] - vendored = ["openssl-src"] -- --[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] --version = "0.2.8" Index: rust/vendor/os_info/Cargo.toml =================================================================== --- rust.orig/vendor/os_info/Cargo.toml @@ -642,21 +652,17 @@ Index: rust/vendor/reqwest/Cargo.toml - -[target."cfg(windows)".dependencies.winreg] -version = "0.10" -Index: rust/vendor/rustix-0.37.22/Cargo.toml +Index: rust/vendor/rustix-0.37.6/Cargo.toml =================================================================== ---- rust.orig/vendor/rustix-0.37.22/Cargo.toml -+++ rust/vendor/rustix-0.37.22/Cargo.toml -@@ -239,19 +239,3 @@ package = "errno" +--- 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.libc_errno] --version = "0.3.1" --default-features = false --package = "errno" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.48.0" +-version = "0.45.0" -features = [ - "Win32_Foundation", - "Win32_Networking_WinSock", @@ -665,12 +671,12 @@ Index: rust/vendor/rustix-0.37.22/Cargo.toml -] - -[target."cfg(windows)".dev-dependencies.ctor] --version = "0.2.0" +-version = "0.1.21" Index: rust/vendor/rustix/Cargo.toml =================================================================== --- rust.orig/vendor/rustix/Cargo.toml +++ rust/vendor/rustix/Cargo.toml -@@ -238,20 +238,3 @@ package = "errno" +@@ -249,20 +249,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -719,7 +725,7 @@ Index: rust/vendor/snapbox/Cargo.toml optional = true - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" +-version = "0.48.0" -features = ["Win32_Foundation"] -optional = true Index: rust/vendor/socket2/Cargo.toml @@ -900,7 +906,7 @@ Index: rust/vendor/terminal_size/Cargo.toml +++ rust/vendor/terminal_size/Cargo.toml @@ -30,10 +30,3 @@ repository = "https://github.com/eminenc [target."cfg(not(windows))".dependencies.rustix] - version = "0.37.0" + version = "0.38.0" features = ["termios"] - -[target."cfg(windows)".dependencies.windows-sys] @@ -922,6 +928,31 @@ 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 +@@ -76,20 +76,3 @@ version = "0.10" + + [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework] + version = "0.2" +- +-[target."cfg(windows)".dev-dependencies.schannel] +-version = "0.1" +- +-[target."cfg(windows)".dev-dependencies.winapi] +-version = "0.3" +-features = [ +- "lmcons", +- "basetsd", +- "minwinbase", +- "minwindef", +- "ntdef", +- "sysinfoapi", +- "timezoneapi", +- "wincrypt", +- "winerror", +-] Index: rust/vendor/tokio/Cargo.toml =================================================================== --- rust.orig/vendor/tokio/Cargo.toml diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index 059a52078..4ac594d0d 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -3,16 +3,16 @@ Always enable cc even if the feature is not enabled. Some Debian architectures need outline asm, and Debian does not ship pre-built outline asm. -Index: rust/vendor/rustix-0.37.22/build.rs +Index: rust/vendor/rustix-0.37.6/build.rs =================================================================== ---- rust.orig/vendor/rustix-0.37.22/build.rs -+++ rust/vendor/rustix-0.37.22/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; -@@ -169,16 +168,16 @@ fn link_in_librustix_outline(arch: &str, +@@ -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. @@ -32,10 +32,10 @@ Index: rust/vendor/rustix-0.37.22/build.rs { let out_dir = var("OUT_DIR").unwrap(); // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix-0.37.22/Cargo.toml +Index: rust/vendor/rustix-0.37.6/Cargo.toml =================================================================== ---- rust.orig/vendor/rustix-0.37.22/Cargo.toml -+++ rust/vendor/rustix-0.37.22/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] diff --git a/debian/patches/series b/debian/patches/series index 0c5160fa2..ca50b1c7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,7 +10,6 @@ c-0003-tests-add-missing-cross-disabled-checks.patch # pending, or forwarded u-reproducible-build.patch -u-ignore-endian-big-diff.patch u-fix-get-toml-when-test.patch u-disable-fp-precision-test-on-i386.patch u-riscv-disable-unpacked-split-debuginfo.patch @@ -71,4 +70,3 @@ ubuntu-disable-ppc64el-asm-tests.patch ubuntu-ignore-arm-doctest.patch d-0020-remove-windows-dependencies.patch d-0021-vendor-remove-windows-dependencies.patch -c-update-libgit2.patch diff --git a/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch index b49347990..f3a3b52c9 100644 --- a/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch +++ b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch @@ -12,20 +12,6 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> tests/ui/issues/issue-21763.stderr | 3 --- 4 files changed, 20 insertions(+), 3 deletions(-) -Index: rust/tests/ui/issues/issue-21763.stderr -=================================================================== ---- rust.orig/tests/ui/issues/issue-21763.stderr -+++ rust/tests/ui/issues/issue-21763.stderr -@@ -9,9 +9,6 @@ LL | foo::<HashMap<Rc<()>, Rc<()>>>( - = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` - note: required because it appears within the type `HashMap<Rc<()>, Rc<()>, RandomState>` - --> $HASHBROWN_SRC_LOCATION -- | --LL | pub struct HashMap<K, V, S = DefaultHashBuilder, A: Allocator + Clone = Global> { -- | ^^^^^^^ - note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` - --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL - note: required by a bound in `foo` Index: rust/tests/ui/issues/issue-21763.rs =================================================================== --- rust.orig/tests/ui/issues/issue-21763.rs diff --git a/debian/patches/u-ignore-endian-big-diff.patch b/debian/patches/u-ignore-endian-big-diff.patch deleted file mode 100644 index faa270173..000000000 --- a/debian/patches/u-ignore-endian-big-diff.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:37 +0200 -Subject: u-ignore-endian-big-diff - -Bug: https://github.com/rust-lang/rust/issues/89577 - -=================================================================== ---- - src/test/ui/consts/const-eval/ub-enum.rs | 1 + - src/test/ui/consts/const-eval/ub-int-array.rs | 1 + - src/test/ui/consts/const-eval/ub-nonnull.rs | 1 + - src/test/ui/consts/const-eval/ub-ref-ptr.rs | 1 + - src/test/ui/consts/const-eval/ub-uninhabit.rs | 1 + - src/test/ui/consts/const-eval/ub-wide-ptr.rs | 1 + - 6 files changed, 6 insertions(+) - -Index: rust/tests/ui/consts/const-eval/ub-enum.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-enum.rs -+++ rust/tests/ui/consts/const-eval/ub-enum.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // stderr-per-bitwidth - // Strip out raw byte dumps to make comparison platform-independent: - // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" -Index: rust/tests/ui/consts/const-eval/ub-int-array.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-int-array.rs -+++ rust/tests/ui/consts/const-eval/ub-int-array.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // stderr-per-bitwidth - //! Test the "array of int" fast path in validity checking, and in particular whether it - //! points at the right array element. -Index: rust/tests/ui/consts/const-eval/ub-nonnull.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-nonnull.rs -+++ rust/tests/ui/consts/const-eval/ub-nonnull.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // Strip out raw byte dumps to make comparison platform-independent: - // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" - // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP" -Index: rust/tests/ui/consts/const-eval/ub-ref-ptr.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-ref-ptr.rs -+++ rust/tests/ui/consts/const-eval/ub-ref-ptr.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // ignore-tidy-linelength - // Strip out raw byte dumps to make comparison platform-independent: - // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" -Index: rust/tests/ui/consts/const-eval/ub-uninhabit.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-uninhabit.rs -+++ rust/tests/ui/consts/const-eval/ub-uninhabit.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // Strip out raw byte dumps to make comparison platform-independent: - // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)" - // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP" -Index: rust/tests/ui/consts/const-eval/ub-wide-ptr.rs -=================================================================== ---- rust.orig/tests/ui/consts/const-eval/ub-wide-ptr.rs -+++ rust/tests/ui/consts/const-eval/ub-wide-ptr.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // ignore-tidy-linelength - #![allow(unused)] - diff --git a/debian/rules b/debian/rules index eb6a2a4d1..ac5631a87 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ ifeq (armhf,$(DEB_TARGET_ARCH)) CLANG_RT_ARCH = armhf endif -ifneq (,$(filter $(DEB_TARGET_ARCH),sparc64 mips64el)) +ifneq (,$(filter $(DEB_TARGET_ARCH),sparc64 mips64el hurd-i386 hurd-amd64)) # sparc64: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061125 # mips64el: has profiler, but buggy atm (32-bit overflow in some counter?) CLANG_RT_ARCH = @@ -335,7 +335,7 @@ endif ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64 s390x riscv64)) FAILURES_ALLOWED = 40 endif -ifneq (,$(filter $(DEB_BUILD_ARCH), loong64 powerpc powerpcspe sparc64 x32)) +ifneq (,$(filter $(DEB_BUILD_ARCH), loong64 powerpc powerpcspe sparc64 x32 hurd-i386 hurd-amd64)) FAILURES_ALLOWED = 180 endif FAILED_TESTS = grep "FAILED\|^command did not execute successfully" $(TEST_LOG) | grep -v '^test result: FAILED' | grep -v 'FAILED (allowed)' @@ -514,7 +514,8 @@ override_dh_compress: override_dh_dwz: # otherwise rustc gets an empty multifile which lintian errors on, causing # FTP auto-reject. this is a work-around, the lintian bug is #955752 - dh_dwz --no-dwz-multifile + # double up the max entries count, else the build might fail.. + dh_dwz --no-dwz-multifile -- -L 100000000 override_dh_makeshlibs: dh_makeshlibs -V -N $(LIBSTD_PKG) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 121a8b4da..a9174bac2 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,5 +1,3 @@ -# Long documentation -rustc source: source-is-missing [library/stdarch/crates/stdarch-verify/arm-intrinsics.html] # Test data rustc source: source-is-missing [src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/*.html] rustc source: source-is-missing [tests/rustdoc/notable-trait/doc-notable_trait*.html] @@ -14,7 +12,7 @@ rustc source: missing-license-paragraph-in-dep5-copyright mpl-2.0+ [debian/copyr rustc source: missing-license-paragraph-in-dep5-copyright debian/copyright mpl-2.0+ (*) # see d/copyright -rustc source: source-contains-prebuilt-windows-binary [vendor/windows-metadata/default/*.winmd] +rustc source: source-contains-prebuilt-windows-binary [vendor/windows-bindgen/default/*.winmd] # lintian is superfluous rustc source: superfluous-file-pattern debian/copyright * (*) diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index df9bff01a..87d575953 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -30,7 +30,6 @@ RELEASES.md compiler/rustc_codegen_cranelift/docs/dwarf.md compiler/rustc_codegen_gcc/Readme.md compiler/rustc_codegen_ssa/messages.ftl -extra/git2/src/cred.rs library/core/src/ffi/c_*.md library/portable-simd/*.md library/std/src/sys/sgx/abi/entry.S @@ -59,6 +58,7 @@ src/doc/rustc/src/lints/groups.md src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md +src/doc/rustc/src/platform-support/unknown-uefi.md src/doc/rustc/src/platform-support/wasm32-wasi-preview1-threads.md src/doc/rustc/src/targets/known-issues.md src/doc/rustdoc/src/*.md @@ -78,7 +78,6 @@ src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs src/tools/rust-analyzer/docs/user/manual.adoc src/tools/rustfmt/*.md tests/mir-opt/building/*.mir -tests/mir-opt/coverage_graphviz.*.InstrumentCoverage.0.dot tests/rustdoc/inline_cross/assoc_item_trait_bounds.out*.html tests/rustdoc/notable-trait/doc-notable_trait*.html tests/rustdoc/notable-trait/spotlight-from-dependency.odd.html @@ -108,6 +107,7 @@ vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xof.rs vendor/elliptic-curve/src/jwk.rs vendor/encoding_rs/src/ascii.rs vendor/encoding_rs/src/utf_16.rs +vendor/faster-hex/src/serde.rs vendor/fiat-crypto/src/secp256k1_dettman_64.rs vendor/git2/src/cred.rs vendor/half/LICENSES/Apache-2.0.txt @@ -117,12 +117,13 @@ vendor/handlebars/src/render.rs vendor/handlebars/src/template.rs vendor/humansize/src/lib.rs vendor/ipnet/RELEASES.md -vendor/kstring/benches/clone.rs vendor/lazy_static/src/lib.rs vendor/maplit/README.rst 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/lib.rs vendor/pulldown-cmark/tests/suite/footnotes.rs vendor/rustc-demangle/src/legacy.rs vendor/spdx-expression/LICENSES/MIT.txt @@ -137,9 +138,15 @@ vendor/tinyvec/LICENSE-*.md vendor/tracing-subscriber/src/fmt/format/json.rs vendor/unicase/src/lib.rs vendor/unicode-normalization/src/stream_safe.rs +vendor/vcpkg/notes.md vendor/web-sys/src/features/gen_SvgTextElement.rs vendor/web-sys/src/features/gen_SvgtSpanElement.rs +vendor/windows-bindgen/src/rust/extensions/mod.rs +vendor/windows-bindgen/src/tokens/mod.rs +vendor/windows-bindgen/src/winmd/writer/tables.rs +vendor/windows-metadata/src/lib.rs vendor/winnow/benches/contains_token.rs +vendor/winnow/benches/iter.rs vendor/zerovec/src/map2d/map.rs # False-positive, audit-vendor-source automatically flags JS/C files @@ -161,7 +168,6 @@ src/tools/rustdoc-js/.eslintrc.js src/tools/rustdoc-js/tester.js vendor/libz-sys/src/smoke.c vendor/openssl-sys/build/expando.c -vendor/signal-hook/src/low_level/extract.c vendor/sysinfo-0.26.7/examples/simple.c vendor/wasm-bindgen-macro/src/worker.js vendor/wasm-bindgen/_package.json @@ -230,7 +236,6 @@ vendor/color-eyre/pictures/minimal.png vendor/color-eyre/pictures/short.png vendor/color-spantrace/pictures/full.png vendor/color-spantrace/pictures/minimal.png -vendor/imara-diff/plots/*.svg vendor/mdbook/src/theme/favicon.png vendor/mdbook/src/theme/favicon.svg vendor/overload/logo.png @@ -254,6 +259,8 @@ src/tools/*/tests/*/*.stderr src/tools/cargo/benches/workspaces/*.tgz src/tools/cargo/crates/mdman/tests/compare/expected/formatting.txt src/tools/cargo/tests/testsuite/*.rs +src/tools/cargo/tests/testsuite/cargo_add/features_activated_over_limit/out/Cargo.toml +src/tools/cargo/tests/testsuite/cargo_add/features_deactivated_over_limit/out/Cargo.toml src/tools/clippy/tests/ui-internal/auxiliary/paths.rs src/tools/clippy/tests/ui-toml/*/*.stderr src/tools/clippy/tests/ui-toml/large_include_file/too_big.txt @@ -279,6 +286,7 @@ tests/*/*/*.stderr tests/*/*/*.stdout tests/*/*/*/*.rs tests/auxiliary/rust_test_helpers.c +tests/coverage-map/status-quo/*.cov-map tests/debuginfo/type-names.cdb.js tests/run-make/*/*.c tests/run-make/libtest-junit/output-default.xml @@ -317,8 +325,11 @@ vendor/flate2/examples/hello_world.txt.gz vendor/flate2/tests/*.gz vendor/flate2/tests/corrupt-gz-file.bin vendor/fluent-syntax/benches/parser.rs +vendor/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz vendor/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz vendor/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz +vendor/gix-pathspec/tests/fixtures/generated-archives/*.tar.xz +vendor/gix-submodule/tests/fixtures/generated-archives/basic.tar.xz vendor/gsgdt/tests/*.json vendor/handlebars/tests/helper_with_space.rs vendor/hkdf/tests/data/*.blb @@ -361,7 +372,9 @@ vendor/proptest/proptest-regressions/test_runner/rng.txt vendor/proptest/src/regex-contrib/crates_regex.rs vendor/regex-automata-0.1.10/data/fowler-tests/basic.dat vendor/regex-automata-0.1.10/data/tests/fowler/basic.dat -vendor/regex-automata/tests/data/fowler/dat/basic.dat +vendor/regex-automata-0.2.0/tests/data/fowler/dat/basic.dat +vendor/regex-automata/tests/fuzz/testdata/deserialize_* +vendor/regex-automata/tests/gen/*/*.dfa vendor/regex/record/compile-test/2023-04-19_1.7.3.csv vendor/regex/record/compile-test/2023-04-20_master.csv vendor/regex/src/testdata/basic.dat @@ -385,7 +398,8 @@ vendor/unicode-ident/tests/fst/*.fst vendor/unicode-segmentation/src/testdata.rs vendor/url/tests/*.json vendor/varisat/proptest-regressions/solver.txt -vendor/vte/tests/demo.vte +vendor/vcpkg/test-data/no-status/installed/vcpkg/updates/* +vendor/vcpkg/test-data/normalized/installed/vcpkg/updates/status vendor/walkdir/compare/nftw.c vendor/wasm-bindgen/tests/headless/* vendor/wasm-bindgen/tests/wasm/* @@ -410,7 +424,7 @@ vendor/unicode-normalization/src/tables.rs vendor/unicode-script/src/tables.rs vendor/unicode-segmentation/src/tables.rs vendor/wasi/src/lib_generated.rs -vendor/windows-metadata/default/*.winmd +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 @@ -462,6 +476,9 @@ vendor/clap_derive/src/derives/args.rs vendor/clap_derive/src/derives/parser.rs vendor/clap_derive/src/derives/subcommand.rs vendor/clap_derive/src/derives/value_enum.rs +vendor/color-print-proc-macro/src/format_args/mod.rs +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/derive_more/src/*.rs @@ -485,13 +502,21 @@ vendor/gimli*/src/read/rnglists.rs vendor/gimli*/src/read/unit.rs vendor/gix-config/src/file/init/mod.rs 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/src/parallel/mod.rs vendor/gix-features/src/parallel/reduce.rs vendor/gix-features/src/zlib/mod.rs vendor/gix-features/src/zlib/stream/inflate.rs +vendor/gix-filter/tests/eol/convert_to_git.rs +vendor/gix-filter/tests/eol/convert_to_worktree.rs +vendor/gix-filter/tests/worktree/mod.rs vendor/gix-odb/src/store_impls/loose/find.rs vendor/gix-path/src/env/git.rs +vendor/gix-pathspec/src/lib.rs +vendor/gix-pathspec/src/parse.rs +vendor/gix-pathspec/tests/parse/mod.rs vendor/gix-protocol/src/fetch/delegate.rs vendor/gix-ref/src/store/packed/decode.rs vendor/gix-ref/src/store/packed/decode/tests.rs @@ -543,6 +568,9 @@ vendor/pulldown-cmark/src/linklabel.rs vendor/pulldown-cmark/tests/lib.rs vendor/rayon/tests/sort-panic-safe.rs vendor/regex-automata-0.1.10/src/regex.rs +vendor/regex-automata/src/dfa/automaton.rs +vendor/regex-automata/src/hybrid/dfa.rs +vendor/regex-automata/src/meta/regex.rs vendor/rustc-rayon/tests/sort-panic-safe.rs vendor/rustc_apfloat/src/lib.rs vendor/rustversion/src/attr.rs @@ -589,7 +617,8 @@ vendor/varisat-dimacs/src/lib.rs vendor/varisat/src/clause/alloc.rs vendor/varisat/src/solver.rs vendor/vec_mut_scan/src/lib.rs -vendor/windows-bindgen/src/constants.rs +vendor/windows-bindgen/src/lib.rs +vendor/windows-bindgen/src/rust/constants.rs vendor/winnow/benches/number.rs vendor/winnow/examples/css/parser.rs vendor/winnow/examples/http/parser.rs @@ -619,6 +648,3 @@ vendor/yansi/src/tests.rs vendor/clap/examples/demo.md vendor/clap/examples/tutorial_builder/*.md vendor/clap/examples/tutorial_derive/*.md -vendor/clap-4.*/examples/demo.md -vendor/clap-4.*/examples/tutorial_builder/*.md -vendor/clap-4.*/examples/tutorial_derive/*.md |