diff options
40 files changed, 682 insertions, 894 deletions
diff --git a/debian/README.source b/debian/README.source index ef42add62..36a28b7cc 100644 --- a/debian/README.source +++ b/debian/README.source @@ -145,7 +145,7 @@ $ git diff # pulled in new unnecessary dependencies in this newer version. See if you can # drop them by amending the patch "d-0000-ignore-removed-submodules.patch". # Rerun the above "tar ..." commands again and check that your patch works. -# For example, there is absolutely no reason why rustc should need openssl. +# For example, there is absolutely no reason to pull in windows-sys/windows. $ git commit -m "Update Files-Excluded for new upstream version ${ver/\~/-}" debian/copyright $ uscan --verbose # yes, again, to pick up the new Files-Excluded stuff diff --git a/debian/changelog b/debian/changelog index 4e037f173..bbe145376 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +rustc (1.72.1+dfsg1-1) unstable; urgency=medium + + * upload to unstable + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Mon, 27 May 2024 13:28:20 +0200 + +rustc (1.72.1+dfsg1-1~exp2) experimental; urgency=medium + + * patches: apply rustix fixup to all versions + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Mon, 27 May 2024 10:20:22 +0200 + +rustc (1.72.1+dfsg1-1~exp1) experimental; urgency=medium + + * New upstream release + * Update wasi-libc to ~git20230621.7018e24 + * Allow more test failures on loong64, and less on riscv64 (Closes: 1071707) + + -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Thu, 23 May 2024 21:16:03 +0200 + rustc (1.71.1+dfsg1-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index ac8ad1d15..9c6f46643 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.70.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (>= 1.70.0+dfsg) <!pkg.rustc.dlstage0>, - rustc:native (<= 1.71.1++) <!pkg.rustc.dlstage0>, + cargo:native (>= 1.71.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (>= 1.71.0+dfsg) <!pkg.rustc.dlstage0>, + rustc:native (<= 1.72.1++) <!pkg.rustc.dlstage0>, llvm-16-dev:native, llvm-16-tools:native, gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>, @@ -52,8 +52,8 @@ Build-Depends: curl <pkg.rustc.dlstage0>, ca-certificates <pkg.rustc.dlstage0>, Build-Depends-Indep: - wasi-libc (>= 0.0~git20230113.4362b18-2~) <!nowasm>, - wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>, + wasi-libc (>= 0.0~git20230621.7018e24~~) <!nowasm>, + wasi-libc (<= 0.0~git20230621.7018e24++) <!nowasm>, clang-16:native, Build-Conflicts: gdb-minimal <!nocheck> Standards-Version: 4.6.2 @@ -89,7 +89,7 @@ Description: Rust systems programming language generic programming and meta-programming, in both static and dynamic styles. -Package: libstd-rust-1.71 +Package: libstd-rust-1.72 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.71 (= ${binary:Version}), + libstd-rust-1.72 (= ${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 @@ -236,8 +236,8 @@ Package: rust-llvm Architecture: all Breaks: rustc (<< 1.71.1+dfsg1-1~exp1), - rust-web (<< 1.71.1+dfsg1-1~exp1), - rust-mozilla (<< 1.71.1+dfsg1-1~exp1), + rustc-web (<< 1.71.1+dfsg1-1~exp1), + rustc-mozilla (<< 1.71.1+dfsg1-1~exp1), Replaces: rustc (<< 1.71.1+dfsg1-1~exp1), rustc-web (<< 1.71.1+dfsg1-1~exp1), @@ -311,7 +311,7 @@ Package: rust-clippy Architecture: any Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends}, - libstd-rust-1.71 (= ${binary:Version}) + libstd-rust-1.72 (= ${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 0cf15d2dc..182c25738 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,8 +43,7 @@ Files-Excluded: vendor/mdbook/src/theme/playground_editor vendor/psm/src/arch/wasm32.o vendor/rustix/src/backend/linux_raw/arch/outline/*/*.a -# Embedded submodule used for CI - library/stdarch/crates/intrinsic-test/acle + vendor/rustix-*/src/backend/linux_raw/arch/outline/*/*.a # Misc vendor/*/icon_CLion.svg vendor/wasm-bindgen/guide @@ -52,44 +51,44 @@ Files-Excluded: vendor/wasm-bindgen/examples/import_js/webpack.config.js # unused dependencies, generated by debian/prune-unused-deps # DO NOT EDIT below, AUTOGENERATED - vendor/ahash-0.8.2 + vendor/addr2line-0.19.0 vendor/aho-corasick-0.7.18 - vendor/ansi_term + vendor/anstyle-1.0.0 + vendor/anstyle-parse-0.2.0 vendor/anstyle-wincon - vendor/anyhow-1.0.65 vendor/anyhow-1.0.66 - vendor/anyhow-1.0.68 + vendor/anyhow-1.0.70 vendor/anymap vendor/arbitrary - vendor/arrayvec-0.7.0 + vendor/arrayvec-0.7.2 + vendor/backtrace-0.3.67 + vendor/bitflags-2.1.0 + vendor/bitflags-2.3.2 vendor/block-buffer-0.10.2 vendor/bstr-0.2.17 - vendor/bstr-1.3.0 vendor/bumpalo-3.11.1 - vendor/bumpalo-3.12.0 - vendor/bytes-1.0.1 - vendor/camino-1.0.9 - vendor/camino-1.1.2 - vendor/cargo_metadata-0.14.0 - vendor/cargo_metadata-0.15.2 vendor/cc-1.0.73 - vendor/cc-1.0.77 - vendor/cc-1.0.78 vendor/chalk-derive vendor/chalk-ir vendor/chalk-recursive vendor/chalk-solve - vendor/clap_complete-4.0.7 - vendor/color-eyre - vendor/color-spantrace + vendor/clap-4.2.4 + vendor/clap-4.3.3 + vendor/clap_builder-4.2.4 + vendor/clap_builder-4.3.3 + vendor/clap_complete-4.2.2 + vendor/clap_derive-4.2.0 + vendor/clap_lex-0.4.1 vendor/command-group vendor/core-foundation vendor/core-foundation-sys-0.8.3 vendor/cpufeatures-0.2.5 + vendor/cpufeatures-0.2.7 vendor/cranelift-bforest vendor/cranelift-codegen vendor/cranelift-codegen-meta vendor/cranelift-codegen-shared + vendor/cranelift-control vendor/cranelift-entity vendor/cranelift-frontend vendor/cranelift-isle @@ -100,7 +99,9 @@ Files-Excluded: vendor/crossbeam-channel-0.5.6 vendor/crossbeam-deque-0.8.2 vendor/crossbeam-epoch-0.9.13 + vendor/crossbeam-epoch-0.9.14 vendor/crossbeam-utils-0.8.14 + vendor/crossbeam-utils-0.8.15 vendor/crypto-common-0.1.3 vendor/ctor-0.1.22 vendor/ctor @@ -109,185 +110,135 @@ Files-Excluded: vendor/diff-0.1.12 vendor/digest-0.10.3 vendor/directories - vendor/dissimilar-1.0.4 vendor/dot - vendor/either-1.6.0 vendor/either-1.6.1 - vendor/either-1.8.0 - vendor/ena-0.14.0 + vendor/env_logger-0.9.3 vendor/errno-0.3.0 - vendor/eyre - vendor/fastrand-1.8.0 vendor/filetime-0.2.16 vendor/filetime-0.2.19 - vendor/filetime-0.2.20 - vendor/form_urlencoded-1.0.1 + vendor/fixedbitset + vendor/flate2-1.0.25 + vendor/form_urlencoded-1.1.0 vendor/fsevent-sys - vendor/fs_extra vendor/fst vendor/fwdansi - vendor/fxhash - vendor/generic-array-0.14.4 vendor/generic-array-0.14.5 - vendor/getrandom-0.2.8 - vendor/gimli-0.27.0 - vendor/glob-0.3.0 + vendor/gimli-0.27.2 vendor/globset-0.4.8 - vendor/globset-0.4.9 - vendor/hashbrown-0.13.1 vendor/heck-0.3.3 - vendor/heck-0.4.0 - vendor/hermit-abi-0.3.0 - vendor/hex-0.4.2 + vendor/hermit-abi-0.2.6 vendor/hkalbasi-rustc-ap-rustc_abi vendor/hkalbasi-rustc-ap-rustc_index vendor/home-0.5.4 - vendor/humantime-2.0.1 - vendor/idna-0.2.0 + vendor/idna-0.3.0 vendor/ignore-0.4.18 - vendor/indenter - vendor/indexmap-1.9.2 vendor/inotify vendor/inotify-sys - vendor/io-lifetimes-1.0.3 vendor/io-lifetimes-1.0.9 - vendor/is-terminal-0.4.6 + vendor/is-terminal-0.4.7 vendor/itoa-1.0.2 - vendor/itoa-1.0.5 vendor/jemalloc-sys - vendor/jod-thread vendor/junction vendor/kqueue vendor/kqueue-sys vendor/libc-0.2.138 - vendor/libc-0.2.139 vendor/libc-0.2.140 - vendor/libc-0.2.143 + vendor/libc-0.2.141 + vendor/libc-0.2.146 vendor/libffi vendor/libffi-sys - vendor/libloading-0.7.1 vendor/libmimalloc-sys vendor/libnghttp2-sys vendor/linked-hash-map vendor/linux-raw-sys-0.3.2 - vendor/lock_api-0.4.7 - vendor/log-0.4.14 + vendor/lock_api-0.4.9 + vendor/log-0.4.17 vendor/lzma-sys-0.1.17 vendor/mach - vendor/matches - vendor/memmap2-0.5.8 vendor/memoffset-0.7.1 vendor/mimalloc + vendor/miniz_oxide-0.6.2 vendor/mio - vendor/miow-0.3.7 vendor/miow vendor/nix - vendor/nom-7.1.0 vendor/notify vendor/ntapi vendor/num_cpus-1.13.1 - vendor/num-traits-0.2.12 - vendor/object-0.30.1 - vendor/object-0.30.2 + vendor/num_cpus-1.15.0 + vendor/object-0.30.3 vendor/once_cell-1.12.0 vendor/once_cell-1.16.0 - vendor/once_cell-1.17.0 + vendor/once_cell-1.17.1 vendor/opener-0.5.0 vendor/openssl-src - vendor/openssl-sys-0.9.85 vendor/output_vt100 - vendor/owo-colors - vendor/parking_lot_core-0.8.5 - vendor/parking_lot_core-0.9.4 vendor/parking_lot_core-0.9.6 vendor/paste - vendor/percent-encoding-2.1.0 - vendor/pest-2.5.2 - vendor/pest_derive-2.5.2 - vendor/pest_generator-2.5.2 - vendor/pest_meta-2.5.2 - vendor/pin-project-lite-0.2.8 + vendor/percent-encoding-2.2.0 + vendor/pest-2.6.0 + vendor/pest_derive-2.6.0 + vendor/pest_generator-2.6.0 + vendor/pest_meta-2.6.0 + vendor/petgraph + vendor/pin-project-lite-0.2.9 vendor/pkg-config-0.3.25 - vendor/ppv-lite86-0.2.8 - vendor/proc-macro2-1.0.50 - vendor/proc-macro2-1.0.56 + vendor/proc-macro2-1.0.60 vendor/protobuf vendor/protobuf-support vendor/pulldown-cmark-0.9.2 vendor/pulldown-cmark-to-cmark - vendor/quote-1.0.23 - vendor/rand_chacha-0.3.0 - vendor/rayon-1.5.3 + vendor/quote-1.0.26 + vendor/quote-1.0.28 vendor/rayon-1.6.0 - vendor/rayon-1.6.1 vendor/rayon-core-1.10.1 - vendor/rayon-core-1.9.3 - vendor/redox_syscall-0.2.10 vendor/redox_syscall-0.2.13 vendor/regalloc2 vendor/regex-1.5.6 - vendor/regex-1.7.1 + vendor/regex-1.7.3 vendor/regex-syntax-0.6.26 - vendor/regex-syntax-0.6.28 vendor/region vendor/rustc-build-sysroot + vendor/rustc-demangle-0.1.22 vendor/rustix-0.37.6 - vendor/rustix-0.37.7 vendor/ryu-1.0.10 - vendor/ryu-1.0.12 - vendor/ryu-1.0.5 vendor/salsa vendor/salsa-macros - vendor/schannel-0.1.19 vendor/schannel vendor/scip - vendor/scoped-tls-1.0.0 vendor/security-framework vendor/security-framework-sys - vendor/semver-1.0.12 - vendor/semver-1.0.16 - vendor/serde-1.0.152 - vendor/serde_derive-1.0.152 + vendor/serde-1.0.160 + vendor/serde_derive-1.0.160 vendor/serde_json-1.0.81 - vendor/serde_json-1.0.85 - vendor/serde_json-1.0.91 + vendor/serde_json-1.0.96 + vendor/serde_spanned-0.6.2 vendor/sha2-0.10.2 - vendor/sharded-slab-0.1.1 + vendor/sha2-0.10.6 vendor/slice-group-by - vendor/socket2-0.4.1 vendor/syn-1.0.102 - vendor/syn-1.0.107 - vendor/syn-2.0.8 + vendor/syn-2.0.15 vendor/tar-0.4.38 vendor/target-lexicon - vendor/tempfile-3.3.0 - vendor/termcolor-1.1.3 - vendor/thiserror-1.0.38 - vendor/thiserror-impl-1.0.38 + vendor/thiserror-1.0.39 + vendor/thiserror-impl-1.0.39 vendor/thread_local-1.1.4 vendor/tikv-jemallocator vendor/tikv-jemalloc-ctl vendor/tikv-jemalloc-sys - vendor/time-0.3.17 - vendor/tinyvec_macros-0.1.0 - vendor/toml-0.5.7 - vendor/tracing-0.1.35 - vendor/tracing-attributes-0.1.22 - vendor/tracing-core-0.1.28 - vendor/tracing-error - vendor/tracing-log-0.1.2 - vendor/tracing-subscriber-0.3.3 - vendor/tracing-tree-0.2.0 + vendor/time-0.3.20 + vendor/time-core-0.1.0 + vendor/toml-0.5.9 + vendor/toml-0.7.4 + vendor/toml_datetime-0.6.2 + vendor/toml_edit-0.19.10 + vendor/tracing-attributes-0.1.23 + vendor/tracing-subscriber-0.3.16 + vendor/tracing-tree-0.2.2 vendor/typed-arena vendor/typenum-1.15.0 - vendor/ui_test - vendor/unicode-bidi-0.3.10 - vendor/unicode-bidi-0.3.4 vendor/unicode-ident-1.0.0 - vendor/unicode-ident-1.0.5 - vendor/unicode-ident-1.0.6 - vendor/url-2.2.2 - vendor/vcpkg-0.2.10 + vendor/unicode-ident-1.0.8 + vendor/url-2.3.1 vendor/walkdir-2.3.2 vendor/wasmtime-jit-icache-coherence vendor/winapi @@ -295,35 +246,28 @@ Files-Excluded: vendor/winapi-util vendor/winapi-x86_64-pc-windows-gnu vendor/windows-0.46.0 - vendor/windows_aarch64_gnullvm-0.42.1 vendor/windows_aarch64_gnullvm-0.42.2 vendor/windows_aarch64_gnullvm - vendor/windows_aarch64_msvc-0.42.1 vendor/windows_aarch64_msvc-0.42.2 vendor/windows_aarch64_msvc vendor/windows - vendor/windows_i686_gnu-0.42.1 vendor/windows_i686_gnu-0.42.2 vendor/windows_i686_gnu - vendor/windows_i686_msvc-0.42.1 vendor/windows_i686_msvc-0.42.2 vendor/windows_i686_msvc vendor/windows-sys-0.42.0 vendor/windows-sys-0.45.0 vendor/windows-sys - vendor/windows-targets-0.42.1 vendor/windows-targets-0.42.2 + vendor/windows-targets-0.48.0 vendor/windows-targets - vendor/windows_x86_64_gnu-0.42.1 vendor/windows_x86_64_gnu-0.42.2 vendor/windows_x86_64_gnu - vendor/windows_x86_64_gnullvm-0.42.1 vendor/windows_x86_64_gnullvm-0.42.2 vendor/windows_x86_64_gnullvm - vendor/windows_x86_64_msvc-0.42.1 vendor/windows_x86_64_msvc-0.42.2 vendor/windows_x86_64_msvc - vendor/xattr-0.2.2 + vendor/winnow-0.4.6 vendor/xz2-0.1.6 vendor/yaml-merge-keys vendor/yaml-rust @@ -381,13 +325,6 @@ Copyright: 2016-2019 Jorge Aparicio <japaricious@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang-nursery/compiler-builtins -Files: vendor/compiletest_rs/* -Copyright: 2015-2020 The Rust Project Developers - 2015-2020 Thomas Bracht Laumann Jespersen <laumann.thomas@gmail.com> - 2015-2020 Manish Goregaokar <manishsmail@gmail.com> -License: Apache-2.0 or MIT -Comment: see https://github.com/laumann/compiletest-rs - Files: vendor/ahash/* vendor/ahash-0.*/* @@ -403,10 +340,12 @@ Comment: see https://github.com/nical/android_system_properties Files: vendor/anstream/* vendor/anstyle/* - vendor/anstyle-0.*/* vendor/anstyle-parse/* -Copyright: 2023 Ed Page <eopage@gmail.com> + vendor/anstyle-query/* + vendor/colorchoice/* +Copyright: 2023-2024 Ed Page <eopage@gmail.com> License: MIT or Apache-2.0 +Comment: see https://github.com/rust-cli/anstyle Files: vendor/ar_archive_writer/* Copyright: 2003-2017 University of Illinois at Urbana-Champaign. @@ -456,8 +395,7 @@ Copyright: 2012-2024 The Servo Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/servo/core-foundation-rs -Files: vendor/num-integer/* - vendor/num-traits/* +Files: vendor/num-traits/* Copyright: 2014-2018 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-num/num @@ -540,6 +478,11 @@ Copyright: 2020-2021 Jonas Schievink <jonasschievink@gmail.com> License: 0BSD or MIT or Apache-2.0 Comment: see https://github.com/jonas-schievink/adler.git +Files: vendor/allocator-api2/* +Copyright: 2023-2024 Zakarum <zaq.dev@icloud.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/zakarumych/allocator-api2 + Files: vendor/always-assert/* Copyright: 2021-2021 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 @@ -550,6 +493,11 @@ Copyright: 2015-2018 Michael Howell <michael@notriddle.com> License: MIT or Apache-2.0 Comment: see https://github.com/notriddle/ammonia +Files: vendor/android-tzdata/* +Copyright: 2023-2023 RumovZ +License: MIT OR Apache-2.0 +Comment: see https://github.com/RumovZ/android-tzdata + Files: vendor/annotate-snippets/* Copyright: 2018-2020 Zibi Braniecki <gandalf@mozilla.com> @@ -557,6 +505,7 @@ License: Apache-2.0 or MIT Comment: see https://github.com/zbraniecki/annotate-snippets-rs Files: vendor/aho-corasick/* + vendor/aho-corasick-0.*/* vendor/memchr/* Copyright: 2015 Andrew Gallant <jamslam@gmail.com> 2015-2018 bluss @@ -740,17 +689,6 @@ Copyright: 2019-2019 The CryptoCorrosion Contributors License: MIT or Apache-2.0 Comment: see https://github.com/cryptocorrosion/cryptocorrosion -Files: - vendor/chalk-derive-0.*/* - vendor/chalk-engine/* - vendor/chalk-ir-0.*/* - vendor/chalk-solve-0.*/* -Copyright: - 2015-2022 Rust Compiler Team - 2015-2022 Chalk developers -License: Apache-2.0 or MIT -Comment: see https://github.com/rust-lang/chalk - Files: vendor/chrono/* Copyright: 2014-2018 Kang Seonghoon <public+rust@mearie.org> License: MIT or Apache-2.0 @@ -759,15 +697,10 @@ Comment: see https://github.com/chronotope/chrono Files: vendor/clap/* vendor/clap-2.*/* - vendor/clap-3.*/* - vendor/clap-4.*/* vendor/clap_builder/* - vendor/clap_builder-4.*/* vendor/clap_complete/* vendor/clap_derive/* - vendor/clap_derive-3.*/* vendor/clap_lex/* - vendor/clap_lex-0.*/* Copyright: 2015-2022 Kevin K. <kbknapp@gmail.com> License: MIT Comment: see https://github.com/clap-rs/clap @@ -777,23 +710,21 @@ Copyright: 2020-2023 marmeladema <xademax@gmail.com> License: MIT Comment: see https://github.com/marmeladema/clru-rs -Files: vendor/codespan-reporting/* -Copyright: 2018-2024 Brendan Zabarauskas <bjzaba@yahoo.com.au> -License: Apache-2.0 -Comment: see https://github.com/brendanzab/codespan +Files: vendor/color-eyre/* +Copyright: 2020-2023 Jane Lusby <jlusby@yaah.dev> +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/color-eyre + +Files: vendor/color-spantrace/* +Copyright: 2020-2024 Jane Lusby <jlusby@yaah.dev> +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/color-spantrace Files: vendor/colored/* Copyright: 2016-2020 Thomas Wickham <mackwic@gmail.com> License: MPL-2.0 Comment: see https://github.com/mackwic/colored -Files: - vendor/concolor-override/* - vendor/concolor-query/* -Copyright: 2021-2023 Ed Page <eopage@gmail.com> -License: MIT OR Apache-2.0 -Comment: see https://github.com/rust-cli/concolor - Files: vendor/content_inspector/* Copyright: 2018-2018 David Peter <mail@david-peter.de> License: MIT or Apache-2.0 @@ -862,15 +793,6 @@ Copyright: 2014-2024 Alex Crichton <alex@alexcrichton.com> License: MIT Comment: see https://github.com/alexcrichton/curl-rust -Files: - vendor/cxx/* - vendor/cxx-build/* - vendor/cxxbridge-flags/* - vendor/cxxbridge-macro/* -Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/cxx - Files: vendor/dashmap/* Copyright: 2019-2022 Acrimon <joel.wejdenstal@gmail.com> License: MIT @@ -907,8 +829,9 @@ Files: vendor/quote/* vendor/syn/* vendor/syn-1.*/* + vendor/syn-2.*/* vendor/unicode-ident/* -Copyright: 2016-2022 David Tolnay <dtolnay@gmail.com> +Copyright: 2016-2024 David Tolnay <dtolnay@gmail.com> License: MIT or Apache-2.0 Comment: see https://github.com/dtolnay/anyhow @@ -922,7 +845,6 @@ Files: vendor/arrayvec/* vendor/arrayvec-0.5.*/* vendor/either/* - vendor/fixedbitset/* vendor/itertools/* vendor/maplit/* vendor/scopeguard/* @@ -998,11 +920,22 @@ Copyright: 2017-2021 Michael Neumann <mneumann@ntecs.de> License: MIT Comment: see https://github.com/mneumann/errno-dragonfly-rs +Files: vendor/equivalent/* +Copyright: 2016-2023 Josh Stone <cuviper@gmail.com> +License: Apache-2.0 OR MIT +Comment: see https://github.com/cuviper/equivalent + Files: vendor/expect-test/* Copyright: 2020-2022 rust-analyzer developers License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/expect-test +Files: vendor/eyre/* +Copyright: 2019-2024 David Tolnay <dtolnay@gmail.com> + 2019-2024 Jane Lusby <jlusby42@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/eyre + Files: vendor/fallible-iterator/* Copyright: 2016-2019 Steven Fackler <sfackler@gmail.com> License: MIT or Apache-2.0 @@ -1108,6 +1041,7 @@ Files: vendor/gix-bitmap/* vendor/gix-chunk/* vendor/gix-command/* + vendor/gix-commitgraph/* vendor/gix-config/* vendor/gix-config-value/* vendor/gix-credentials/* @@ -1123,6 +1057,7 @@ Files: vendor/gix-index/* vendor/gix-lock/* vendor/gix-mailmap/* + vendor/gix-negotiate/* vendor/gix-object/* vendor/gix-odb/* vendor/gix-pack/* @@ -1134,6 +1069,7 @@ Files: vendor/gix-ref/* vendor/gix-refspec/* vendor/gix-revision/* + vendor/gix-revwalk/* vendor/gix-sec/* vendor/gix-tempfile/* vendor/gix-transport/* @@ -1142,7 +1078,9 @@ Files: vendor/gix-utils/* vendor/gix-validate/* vendor/gix-worktree/* -Copyright: 2018-2024 Sebastian Thiel <sebastian.thiel@icloud.com> +Copyright: + 2018-2024 Sebastian Thiel <sebastian.thiel@icloud.com> + 2018-2024 Conor Davis <gitoxide@conor.fastmail.fm> License: MIT or Apache-2.0 Comment: see https://github.com/Byron/gitoxide @@ -1246,7 +1184,14 @@ Copyright: 2017-2022 Bodil Stokke <bodil@bodil.org> License: MPL-2.0+ Comment: see https://github.com/bodil/im-rs -Files: vendor/indexmap/* +Files: vendor/indenter/* +Copyright: 2020-2023 Jane Lusby <jlusby@yaah.dev> +License: MIT OR Apache-2.0 +Comment: see https://github.com/yaahc/indenter + +Files: + vendor/indexmap/* + vendor/indexmap-1.*/* Copyright: 2016-2019 bluss 2016-2019 Josh Stone <cuviper@gmail.com> License: Apache-2.0 or MIT @@ -1285,6 +1230,11 @@ Copyright: 2022-2023 softprops <d.tangren@gmail.com> License: MIT Comment: see https://github.com/sunfishcode/is-terminal +Files: vendor/jod-thread/* +Copyright: 2019-2020 Aleksey Kladov <aleksey.kladov@gmail.com> +License: MIT OR Apache-2.0 +Comment: see https://github.com/matklad/jod-thread + Files: vendor/js-sys/* vendor/wasm-bindgen/* @@ -1305,12 +1255,6 @@ License: MIT or Apache-2.0 Comment: see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys -Files: vendors/web-sys/webidls/enabled/MediaCapabilities.webidl -Copyright: 2018 the Contributors to the Media Capabilities Specification -License: MPL-2.0 -Comment: - see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys - Files: vendor/web-sys/webidls/enabled/*.webidl vendor/web-sys/webidls/unavailable_option_primitive/*.webidl vendor/web-sys/webidls/unstable/*.webidl @@ -1321,6 +1265,12 @@ License: MPL-2.0 Comment: see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys +Files: vendor/web-sys/webidls/enabled/MediaCapabilities.webidl +Copyright: 2018 the Contributors to the Media Capabilities Specification +License: MPL-2.0 +Comment: + see https://github.com/rustwasm/wasm-bindgen/tee/master/crates/web-sys + Files: vendor/web-sys/webidls/enabled/PointerEvent.webidl Copyright: 2013 Microsoft Open Technologies, Inc. */ License: MPL-2.0 @@ -1381,12 +1331,9 @@ Copyright: 2014-2024 Alex Crichton <alex@alexcrichton.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-lang/libz-sys -Files: vendor/link-cplusplus/* -Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/link-cplusplus - -Files: vendor/linux-raw-sys/* +Files: + vendor/linux-raw-sys/* + vendor/linux-raw-sys-0.*/* Copyright: 2021-2022 Dan Gohman <dev@sunfishcode.online> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT Comment: see https://github.com/sunfishcode/linux-raw-sys @@ -1434,7 +1381,7 @@ Comment: see https://github.com/RazrFalcon/memmap2-rs Files: vendor/memoffset/* - vendor/memoffset-0.6.5/* + vendor/memoffset-0.*/* Copyright: 2017-2019 Gilad Naaman <gilad.naaman@gmail.com> License: MIT Comment: see https://github.com/Gilnaa/memoffset @@ -1466,6 +1413,11 @@ Copyright: 2014-2018 Matt Brubeck <mbrubeck@limpet.net> License: MIT Comment: see https://github.com/mbrubeck/rust-debug-unreachable +Files: vendor/nohash-hasher/* +Copyright: 2018-2020 Parity Technologies <admin@parity.io> +License: Apache-2.0 OR MIT +Comment: see https://github.com/paritytech/nohash-hasher + Files: vendor/normalize-line-endings/* Copyright: 2016-2018 Richard Dodd <richdodj@gmail.com> License: Apache-2.0 @@ -1556,16 +1508,16 @@ Copyright: 2015-2024 Jan Schulte <hello@unexpected-co.de> License: MIT Comment: see https://github.com/stanislav-tkach/os_info -Files: vendor/os_str_bytes/* -Copyright: 2019-2022 dylni -License: MIT OR Apache-2.0 -Comment: see https://github.com/dylni/os_str_bytes - Files: vendor/overload/* Copyright: 2019-2022 Daniel Salvadori <danaugrs@gmail.com> License: MIT Comment: see https://github.com/danaugrs/overload +Files: vendor/owo-colors/* +Copyright: 2020-2024 jam1garner <8260240+jam1garner@users.noreply.github.com> +License: MIT +Comment: see https://github.com/jam1garner/owo-colors + Files: vendor/hashbrown/* vendor/hashbrown-0.*/* @@ -1608,6 +1560,7 @@ Comment: see https://github.com/Manishearth/pathdiff Files: vendor/perf-event/* vendor/perf-event-open-sys/* + vendor/perf-event-open-sys-1.*/* Copyright: 2019-2022 Jim Blandy <jimb@red-bean.com> License: MIT OR Apache-2.0 Comment: see https://github.com/jimblandy/perf-event.git @@ -1629,12 +1582,6 @@ Copyright: 2018-2018 The Rust Project Developers License: Apache-2.0 or MIT Comment: see https://github.com/rust-lang-nursery/polonius -Files: vendor/petgraph/* -Copyright: 2014-2018 bluss - 2014-2018 mitchmindtree -License: MIT or Apache-2.0 -Comment: see https://github.com/bluss/petgraph - Files: vendor/phf/* vendor/phf_codegen/* @@ -1675,13 +1622,6 @@ Copyright: 2016-2023 Sean McArthur <sean@seanmonstar> License: MIT or Apache-2.0 Comment: see https://github.com/seanmonstar/pretty-env-logger -Files: - vendor/proc-macro-error/* - vendor/proc-macro-error-attr/* -Copyright: 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru> -License: MIT OR Apache-2.0 -Comment: see https://gitlab.com/CreepySkeleton/proc-macro-error - Files: vendor/proc-macro-hack/* Copyright: 2016-2022 David Tolnay <dtolnay@gmail.com> License: MIT OR Apache-2.0 @@ -1759,17 +1699,12 @@ Copyright: 2018-2020 Andrew Gallant <jamslam@gmail.com> License: Unlicense or MIT Comment: see https://github.com/BurntSushi/regex-automata -Files: vendor/remove_dir_all/* -Copyright: 2017-2018 Aaronepower <theaaronepower@gmail.com> -License: MIT or Apache-2.0 -Comment: see https://github.com/Aaronepower/remove_dir_all.git - Files: vendor/rowan/* Copyright: 2018-2022 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/rowan -Files: vendor/rustc-ap-rustc_lexer/* +Files: vendor/ra-ap-rustc_lexer/* Copyright: 2010-2022 The Rust Project Developers License: MIT or Apache-2.0 Comment: see https://github.com/rust-lang/rust @@ -1784,10 +1719,6 @@ Copyright: 2020-2020 flip1995 <hello@philkrones.com> License: MIT OR Apache-2.0 Comment: see https://github.com/flip1995/rustc-semver -Files: vendor/rustc-workspace-hack/* -Copyright: 2024 Alex Crichton <alex@alexcrichton.com> -License: MIT or Apache-2.0 - Files: vendor/rustc_version/* Copyright: 2015-2021 Dirkjan Ochtman <dirkjan@ochtman.nl> 2015-2021 Marvin Löbel <loebel.marvin@gmail.com> @@ -1801,7 +1732,9 @@ Copyright: License: Apache-2.0 or MIT Comment: see https://github.com/killercup/rustfix -Files: vendor/rustix/* +Files: + vendor/rustix/* + vendor/rustix-0.*/* Copyright: 2020-2023 Dan Gohman <dev@sunfishcode.online> 2020-2023 Jakub Konka <kubkon@jakubkonka.com> License: Apache-2.0 with LLVM exception OR Apache-2.0 OR MIT @@ -1827,11 +1760,6 @@ Copyright: 2018-2018 David Tolnay <dtolnay@gmail.com> License: Apache-2.0 or BSL-1.0 Comment: see https://github.com/dtolnay/ryu -Files: vendor/scratch/* -Copyright: 2020-2024 David Tolnay <dtolnay@gmail.com> -License: MIT OR Apache-2.0 -Comment: see https://github.com/dtolnay/scratch - Files: vendor/self_cell/* Copyright: 2020-2021 Lukas Bergdoll <lukas.bergdoll@gmail.com> License: Apache-2.0 @@ -1846,8 +1774,10 @@ Comment: see https://github.com/steveklabnik/semver see https://github.com/steveklabnik/semver-parser -Files: vendor/serde/* - vendor/serde_json/* +Files: + vendor/serde/* + vendor/serde-1.*/* + vendor/serde_json/* Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com> License: MIT or Apache-2.0 Comment: @@ -1860,7 +1790,9 @@ Copyright: 2015-2021 Pyfisch <pyfisch@posteo.org> License: MIT or Apache-2.0 Comment: see https://github.com/pyfisch/cbor -Files: vendor/serde_derive/* +Files: + vendor/serde_derive/* + vendor/serde_derive-1.*/* Copyright: 2014-2017 Erick Tryzelaar <erick.tryzelaar@gmail.com> 2016-2017 David Tolnay <dtolnay@gmail.com> License: MIT or Apache-2.0 @@ -2060,9 +1992,7 @@ Copyright: 2018-2021 Aleksey Kladov <aleksey.kladov@gmail.com> License: MIT OR Apache-2.0 Comment: see https://github.com/rust-analyzer/text-size -Files: - vendor/textwrap/* - vendor/textwrap-0.*/* +Files: vendor/textwrap/* Copyright: 2016-2024 Martin Geisler <martin@geisler.net> License: MIT Comment: see https://github.com/mgeisler/textwrap @@ -2143,12 +2073,14 @@ Files: vendor/tracing/* vendor/tracing-attributes/* vendor/tracing-core/* + vendor/tracing-error/* vendor/tracing-log/* vendor/tracing-subscriber/* Copyright: - 2018-2020 Eliza Weisman <eliza@buoyant.io> - 2018-2020 Tokio Contributors <team@tokio.rs> - 2018-2020 David Barsky <dbarsky@amazon.com> + 2018-2024 David Barsky <dbarsky@amazon.com> + 2018-2024 Eliza Weisman <eliza@buoyant.io> + 2018-2024 Jane Lusby <jlusby@yaah.dev> + 2018-2024 Tokio Contributors <team@tokio.rs> License: MIT Comment: see https://github.com/tokio-rs/tracing @@ -2158,6 +2090,11 @@ Copyright: 2020-2020 David Barsky <me@davidbarsky.com> License: MIT OR Apache-2.0 Comment: see https://github.com/davidbarsky/tracing-tree +Files: vendor/triomphe/* +Copyright: 2018-2024 The Servo Project Developers +License: MIT OR Apache-2.0 +Comment: see https://github.com/Manishearth/triomphe + Files: vendor/twox-hash/* Copyright: 2015-2022 Jake Goulding <jake.goulding@gmail.com> License: MIT @@ -2174,6 +2111,16 @@ 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/* +Copyright: + 2010-2024 The Rust Project Developers + 2015-2024 Thomas Bracht Laumann Jespersen <laumann.thomas@gmail.com> + 2015-2024 Manish Goregaokar <manishsmail@gmail.com> + 2022-2024 Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> +License: MIT OR Apache-2.0 +Comment: see https://github.com/oli-obk/ui_test + extraction of compiletest-rs from rustc itself + Files: vendor/unarray/* Copyright: 2022 Cameron <cameron.studdstreet@gmail.com> License: MIT OR Apache-2.0 diff --git a/debian/libstd-rust-1.71.lintian-overrides b/debian/libstd-rust-1.71.lintian-overrides deleted file mode 100644 index d9c4d25cf..000000000 --- a/debian/libstd-rust-1.71.lintian-overrides +++ /dev/null @@ -1,13 +0,0 @@ -# "libstd" just seemed too generic -libstd-rust-1.71 binary: package-name-doesnt-match-sonames -libstd-rust-1.71 binary: sharedobject-in-library-directory-missing-soname - -# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff -libstd-rust-1.71 binary: dev-pkg-without-shlib-symlink -libstd-rust-1.71 binary: shlib-without-versioned-soname -libstd-rust-1.71 binary: unused-shlib-entry-in-control-file - -# Libraries that use libc symbols (libterm, libstd, etc) *are* linked -# to libc. Lintian gets upset that some Rust libraries don't need -# libc, boo hoo. -libstd-rust-1.71 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.71.install b/debian/libstd-rust-1.72.install index cd4545cca..cd4545cca 100644 --- a/debian/libstd-rust-1.71.install +++ b/debian/libstd-rust-1.72.install diff --git a/debian/libstd-rust-1.72.lintian-overrides b/debian/libstd-rust-1.72.lintian-overrides new file mode 100644 index 000000000..c7ff5a226 --- /dev/null +++ b/debian/libstd-rust-1.72.lintian-overrides @@ -0,0 +1,16 @@ +# "libstd" just seemed too generic +libstd-rust-1.72 binary: package-name-doesnt-match-sonames +libstd-rust-1.72 binary: sharedobject-in-library-directory-missing-soname + +# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff +libstd-rust-1.72 binary: dev-pkg-without-shlib-symlink +libstd-rust-1.72 binary: shlib-without-versioned-soname +libstd-rust-1.72 binary: unused-shlib-entry-in-control-file + +# can trigger if all its so files' hashes start with a latter and not a digit +libstd-rust-1.72 binary: empty-shlibs + +# Libraries that use libc symbols (libterm, libstd, etc) *are* linked +# to libc. Lintian gets upset that some Rust libraries don't need +# libc, boo hoo. +libstd-rust-1.72 binary: library-not-linked-against-libc diff --git a/debian/libstd-rust-1.72.triggers b/debian/libstd-rust-1.72.triggers new file mode 100644 index 000000000..a88c20f92 --- /dev/null +++ b/debian/libstd-rust-1.72.triggers @@ -0,0 +1,2 @@ +# normally added by dh_makeshlibs, but fails for our versioning scheme +activate-noawait ldconfig diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch index 8fe7c1ca9..192571e46 100644 --- a/debian/patches/c-update-libgit2.patch +++ b/debian/patches/c-update-libgit2.patch @@ -10,10 +10,10 @@ Index: rust/src/tools/cargo/Cargo.toml -git2-curl = "0.18.0" +git2 = "0.18" +git2-curl = "0.19.0" - gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } - gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] } + gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } + gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } glob = "0.3.0" -@@ -53,7 +53,7 @@ jobserver = "0.1.26" +@@ -52,7 +52,7 @@ jobserver = "0.1.26" lazy_static = "1.3.0" lazycell = "1.2.0" libc = "0.2.144" diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index e90237fa8..1cea0a8bf 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -3,18 +3,18 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules --- - Cargo.toml | 11 +++----- - src/bootstrap/bootstrap.py | 4 --- + Cargo.toml | 7 ----- + src/bootstrap/bootstrap.py | 6 +---- src/bootstrap/builder.rs | 54 +++++++++----------------------------- src/bootstrap/test.rs | 12 +-------- src/tools/rust-analyzer/Cargo.toml | 11 +++++++- - 5 files changed, 28 insertions(+), 64 deletions(-) + 5 files changed, 25 insertions(+), 65 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 8eb378a..70487ec 100644 +index 20b1c65..16d4ebe 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -18,22 +18,15 @@ members = [ +@@ -20,22 +20,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -38,13 +38,13 @@ index 8eb378a..70487ec 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 58d1926..527282d 100644 +index 149350e..2813c89 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -899,10 +899,6 @@ class RustBuild(object): +@@ -946,10 +946,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] - args.extend("--verbose" for _ in range(verbose_count)) + args.extend("--verbose" for _ in range(self.verbose)) - if self.use_locked_deps: - args.append("--locked") - if self.use_vendored_sources: @@ -53,10 +53,10 @@ index 58d1926..527282d 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 2fa4455..3f3e5ec 100644 +index 05b66f9..ff1f0eb 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -492,20 +492,20 @@ impl<'a> ShouldRun<'a> { +@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +89,7 @@ index 2fa4455..3f3e5ec 100644 submodules_paths }; -@@ -672,25 +672,14 @@ impl<'a> Builder<'a> { +@@ -646,25 +646,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -115,7 +115,7 @@ index 2fa4455..3f3e5ec 100644 ), Kind::Check | Kind::Clippy | Kind::Fix => describe!( check::Std, -@@ -698,11 +687,6 @@ impl<'a> Builder<'a> { +@@ -672,12 +661,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -123,11 +123,12 @@ index 2fa4455..3f3e5ec 100644 - check::CargoMiri, - check::MiroptTestTools, - check::Rls, -- check::RustAnalyzer, check::Rustfmt, +- check::RustAnalyzer, check::Bootstrap ), -@@ -730,7 +714,6 @@ impl<'a> Builder<'a> { + Kind::Test => describe!( +@@ -706,7 +690,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -135,7 +136,7 @@ index 2fa4455..3f3e5ec 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -746,7 +729,6 @@ impl<'a> Builder<'a> { +@@ -722,7 +705,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -143,7 +144,7 @@ index 2fa4455..3f3e5ec 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -783,7 +765,6 @@ impl<'a> Builder<'a> { +@@ -759,7 +741,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -151,7 +152,7 @@ index 2fa4455..3f3e5ec 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -801,12 +782,9 @@ impl<'a> Builder<'a> { +@@ -777,12 +758,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -164,7 +165,7 @@ index 2fa4455..3f3e5ec 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -823,11 +801,9 @@ impl<'a> Builder<'a> { +@@ -799,11 +777,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -176,7 +177,7 @@ index 2fa4455..3f3e5ec 100644 install::LlvmTools, install::Src, install::Rustc -@@ -837,7 +813,6 @@ impl<'a> Builder<'a> { +@@ -813,7 +789,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -184,7 +185,7 @@ index 2fa4455..3f3e5ec 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1979,10 +1954,7 @@ impl<'a> Builder<'a> { +@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> { } } @@ -197,10 +198,10 @@ index 2fa4455..3f3e5ec 100644 } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 44cd84b..9b37d5d 100644 +index eed7a58..c3bf972 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -2004,17 +2004,7 @@ impl Step for RustcGuide { +@@ -2129,17 +2129,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -209,7 +210,7 @@ index 44cd84b..9b37d5d 100644 - - let src = builder.src.join(relative_path); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); -- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) { +- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() { - ToolState::TestPass - } else { - ToolState::TestFail @@ -220,7 +221,7 @@ index 44cd84b..9b37d5d 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index 333f03c..2a0faa2 100644 +index 3050cf7..174e1f0 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ @@ -237,5 +238,5 @@ index 333f03c..2a0faa2 100644 + "crates/proc-macro-api", +] exclude = ["crates/proc-macro-test/imp"] + resolver = "2" - [workspace.package] diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch index 9e49580b1..4cdf7fbbb 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -8,7 +8,7 @@ Subject: d-0001-pkg-config-no-special-snowflake 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs -index e9395be..2f6819c 100644 +index 3653032..7b82fa5 100644 --- a/vendor/pkg-config/src/lib.rs +++ b/vendor/pkg-config/src/lib.rs @@ -117,11 +117,8 @@ pub enum Error { @@ -49,7 +49,7 @@ index e9395be..2f6819c 100644 } } } -@@ -418,6 +407,8 @@ impl Config { +@@ -420,6 +409,8 @@ impl Config { if host == target { return true; } @@ -59,23 +59,23 @@ index e9395be..2f6819c 100644 // pkg-config may not be aware of cross-compilation, and require // a wrapper script that sets up platform-specific prefixes. @@ -477,7 +468,11 @@ impl Config { - fn command(&self, name: &str, args: &[&str]) -> Command { - let exe = self - .targetted_env_var("PKG_CONFIG") -- .unwrap_or_else(|| OsString::from("pkg-config")); -+ .unwrap_or_else(|| { + } + + fn run(&self, name: &str, args: &[&str]) -> Result<Vec<u8>, Error> { +- let pkg_config_exe = self.targetted_env_var("PKG_CONFIG"); ++ let pkg_config_exe = self.targetted_env_var("PKG_CONFIG") ++ .or_else(|| { + self.env_var_os("DEB_HOST_GNU_TYPE") -+ .map(|mut t| { t.push(OsString::from("-pkg-config")); t }) -+ .unwrap_or_else(|| OsString::from("pkg-config")) ++ .map(|mut t| { t.push(OsString::from("-pkgconf")); t }) + }); - let mut cmd = Command::new(exe); - if self.is_static(name) { - cmd.arg("--static"); + let fallback_exe = if pkg_config_exe.is_none() { + Some(OsString::from("pkgconf")) + } else { diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs -index 4e04ac0..f884e46 100644 +index 0f37c72..f70e8b7 100644 --- a/vendor/pkg-config/tests/test.rs +++ b/vendor/pkg-config/tests/test.rs -@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> { +@@ -31,7 +31,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> { pkg_config::probe_library(name) } @@ -83,7 +83,7 @@ index 4e04ac0..f884e46 100644 fn cross_disabled() { let _g = LOCK.lock(); reset(); -@@ -46,7 +45,6 @@ fn cross_disabled() { +@@ -43,7 +42,6 @@ fn cross_disabled() { } } diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index 568bf230f..c6acfd458 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -6,12 +6,12 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase --- src/tools/linkchecker/main.rs | 28 +++++- vendor/mdbook/src/book/init.rs | 19 ---- - .../src/renderer/html_handlebars/hbs_renderer.rs | 110 ++++----------------- + .../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++----------------- .../mdbook/src/renderer/html_handlebars/search.rs | 2 - - vendor/mdbook/src/theme/index.hbs | 99 +------------------ - vendor/mdbook/src/theme/mod.rs | 27 ----- + vendor/mdbook/src/theme/index.hbs | 99 +------------------- + vendor/mdbook/src/theme/mod.rs | 27 ------ vendor/mdbook/src/theme/searcher/mod.rs | 2 - - 7 files changed, 47 insertions(+), 240 deletions(-) + 7 files changed, 47 insertions(+), 234 deletions(-) diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index c8a3700..4095c03 100644 @@ -67,7 +67,7 @@ index c8a3700..4095c03 100644 report.links_ignored_exception += 1; } else { diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs -index ebcdd93..41dab42 100644 +index faca1d0..c1a82a3 100644 --- a/vendor/mdbook/src/book/init.rs +++ b/vendor/mdbook/src/book/init.rs @@ -153,25 +153,6 @@ impl BookBuilder { @@ -97,10 +97,10 @@ index ebcdd93..41dab42 100644 } diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -index e170e2f..caa2eff 100644 +index 709aa06..17ff63c 100644 --- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition}; +@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio use crate::errors::*; use crate::renderer::html_handlebars::helpers; use crate::renderer::{RenderContext, Renderer}; @@ -116,7 +116,7 @@ index e170e2f..caa2eff 100644 use std::path::{Path, PathBuf}; use crate::utils::fs::get_404_output_file; -@@ -235,105 +236,28 @@ impl HtmlHandlebars { +@@ -250,99 +251,28 @@ impl HtmlHandlebars { if let Some(contents) = &theme.favicon_svg { write_file(destination, "favicon.svg", contents)?; } @@ -175,7 +175,8 @@ index e170e2f..caa2eff 100644 + "/usr/share/javascript/mathjax/MathJax.js", + destination.join("MathJax.js"), )?; -- if html_config.copy_fonts { +- // Don't copy the stock fonts if the user has specified their own fonts to use. +- if html_config.copy_fonts && theme.fonts_css.is_none() { - write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; - for (file_name, contents) in theme::fonts::LICENSES.iter() { - write_file(destination, file_name, contents)?; @@ -191,20 +192,13 @@ index e170e2f..caa2eff 100644 - } - if let Some(fonts_css) = &theme.fonts_css { - if !fonts_css.is_empty() { -- if html_config.copy_fonts { -- warn!( -- "output.html.copy_fonts is deprecated.\n\ -- Set copy_fonts=false and ensure the fonts you want are in \ -- the `theme/fonts/` directory." -- ); -- } -- write_file(destination, "fonts/fonts.css", &fonts_css)?; +- write_file(destination, "fonts/fonts.css", fonts_css)?; - } - } - if !html_config.copy_fonts && theme.fonts_css.is_none() { - warn!( -- "output.html.copy_fonts is deprecated.\n\ -- This book appears to have copy_fonts=false without a fonts.css file.\n\ +- "output.html.copy-fonts is deprecated.\n\ +- This book appears to have copy-fonts=false in book.toml without a fonts.css file.\n\ - Add an empty `theme/fonts/fonts.css` file to squelch this warning." - ); - } @@ -238,7 +232,7 @@ index e170e2f..caa2eff 100644 Ok(()) } diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs -index a9e2f5c..3e3f69c 100644 +index 24d62fd..849a48c 100644 --- a/vendor/mdbook/src/renderer/html_handlebars/search.rs +++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs @@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) -> @@ -251,7 +245,7 @@ index a9e2f5c..3e3f69c 100644 } diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs -index 6f3948c..7e5c54c 100644 +index 80315c4..48413b0 100644 --- a/vendor/mdbook/src/theme/index.hbs +++ b/vendor/mdbook/src/theme/index.hbs @@ -33,10 +33,7 @@ @@ -324,7 +318,7 @@ index 6f3948c..7e5c54c 100644 <nav id="sidebar" class="sidebar" aria-label="Table of contents"> <div class="sidebar-scrollbox"> {{#toc}}{{/toc}} -@@ -240,54 +195,8 @@ +@@ -262,54 +217,8 @@ </script> {{/if}} diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index 17254fb53..09b8db752 100644 --- a/debian/patches/d-0005-no-jemalloc.patch +++ b/debian/patches/d-0005-no-jemalloc.patch @@ -26,7 +26,7 @@ index 41003ad..0578f7b 100644 max_level_info = ['rustc_driver_impl/max_level_info'] rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler'] diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml -index 6273ea5..642fb05 100644 +index 602e742..5faecc5 100644 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml @@ -17,7 +17,6 @@ cfg-if = "1.0.0" @@ -36,7 +36,7 @@ index 6273ea5..642fb05 100644 -jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true } [target.'cfg(target_os = "linux")'.dependencies] - perf-event = "0.4.7" + perf-event = "=0.4.7" @@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } [features] 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 7c31b69d9..21e1e0b06 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -4,14 +4,14 @@ Subject: d-0010-cargo-remove-vendored-c-crates Last-Update: 2023-05-17 --- - src/tools/cargo/Cargo.toml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/tools/cargo/Cargo.toml | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 05c95c7..a7475f6 100644 +index 7e383be..384fe45 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml -@@ -206,8 +206,6 @@ test = false +@@ -203,8 +203,6 @@ test = false doc = false [features] diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch index 00e59567c..b9a1f1b69 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 945ee8e..04b9800 100644 +index d89f441..6d89163 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 f643a446f..e30e2a40d 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 d56054a..4c2aa4b 100644 +index 9b99d5a..980f94a 100644 --- a/src/tools/cargo/src/cargo/core/features.rs +++ b/src/tools/cargo/src/cargo/core/features.rs -@@ -1183,9 +1183,8 @@ pub fn channel() -> String { +@@ -1215,9 +1215,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 624f3bcfd..0a6bd3235 100644 --- a/debian/patches/d-0020-remove-windows-dependencies.patch +++ b/debian/patches/d-0020-remove-windows-dependencies.patch @@ -9,31 +9,32 @@ Subject: d-0020-remove-windows-dependencies compiler/rustc_driver_impl/Cargo.toml | 6 ---- compiler/rustc_errors/Cargo.toml | 8 ----- compiler/rustc_session/Cargo.toml | 7 ---- - library/backtrace/Cargo.toml | 3 -- + library/backtrace/Cargo.toml | 13 ------- src/bootstrap/Cargo.toml | 15 -------- - src/tools/cargo/Cargo.toml | 17 --------- + src/tools/cargo/Cargo.toml | 18 ++-------- .../cargo/crates/cargo-test-support/Cargo.toml | 41 ++++++++++------------ src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ---- src/tools/cargo/crates/home/Cargo.toml | 3 -- src/tools/compiletest/Cargo.toml | 10 ------ + 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 --- - 14 files changed, 19 insertions(+), 122 deletions(-) + 15 files changed, 22 insertions(+), 133 deletions(-) diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml -index 0ac12d3..3f483ab 100644 +index 984efa2..f4c194b 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -49,7 +49,3 @@ libc = "0.2.50" version = "0.31.1" default-features = false - features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"] + features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"] - -[target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" -features = ["Win32_Globalization"] diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml -index 78f73d1..fce2ee0 100644 +index a5c3cb3..5cf1462 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -37,16 +37,6 @@ itertools = "0.10.1" @@ -71,7 +72,7 @@ index 67352c5..f27cb40 100644 llvm = ['rustc_interface/llvm'] max_level_info = ['rustc_log/max_level_info'] diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml -index bd3033f..83c8036 100644 +index e8bcd7c..36a5ee6 100644 --- a/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml @@ -26,13 +26,5 @@ termize = "0.1.1" @@ -89,10 +90,10 @@ index bd3033f..83c8036 100644 [features] rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler'] diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml -index 3af83aa..c3d2a00 100644 +index 1291d14..d9f8675 100644 --- a/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml -@@ -23,10 +23,3 @@ termize = "0.1.1" +@@ -25,10 +25,3 @@ termize = "0.1.1" [target.'cfg(unix)'.dependencies] libc = "0.2" @@ -104,10 +105,10 @@ index 3af83aa..c3d2a00 100644 - "Win32_System_LibraryLoader", -] diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml -index 4779091..aa78771 100644 +index cff2c9e..ad053f0 100644 --- a/library/backtrace/Cargo.toml +++ b/library/backtrace/Cargo.toml -@@ -45,9 +45,6 @@ version = "0.30.0" +@@ -45,9 +45,6 @@ version = "0.31.1" default-features = false features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] @@ -135,10 +136,10 @@ index 4779091..aa78771 100644 [[example]] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml -index 367c619..72c9992 100644 +index 85eb543..cf21349 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml -@@ -63,21 +63,6 @@ semver = "1.0.17" +@@ -62,21 +62,6 @@ semver = "1.0.17" [target.'cfg(not(target_os = "solaris"))'.dependencies] fd-lock = "3.0.8" @@ -161,7 +162,7 @@ index 367c619..72c9992 100644 pretty_assertions = "1.2" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index a7475f6..4ad22f5 100644 +index 384fe45..7ed3853 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -2,7 +2,9 @@ @@ -183,7 +184,7 @@ index a7475f6..4ad22f5 100644 [package] name = "cargo" -@@ -174,22 +175,6 @@ walkdir.workspace = true +@@ -174,19 +175,6 @@ walkdir.workspace = true [target.'cfg(not(windows))'.dependencies] openssl = { workspace = true, optional = true } @@ -196,11 +197,8 @@ index a7475f6..4ad22f5 100644 - "Win32_Foundation", - "Win32_Storage_FileSystem", - "Win32_System_Console", -- "Win32_System_IO", - "Win32_System_Threading", - "Win32_System_JobObjects", -- "Win32_Security", -- "Win32_System_SystemServices" -] - [dev-dependencies] @@ -256,7 +254,7 @@ index 305c809a..c656678 100644 +toml = "0.7.0" +url = "2.2.2" diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml -index f01705f..138690f 100644 +index 6145810..46af186 100644 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml @@ -19,10 +19,3 @@ same-file.workspace = true @@ -299,11 +297,25 @@ index d2f2583..61f7be4 100644 - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] +diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml +index 5faecc5..0d39d3b 100644 +--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml ++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml +@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] } + [target.'cfg(target_os = "linux")'.dependencies] + perf-event = "=0.4.7" + +-[target.'cfg(windows)'.dependencies] +-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } +- + [features] + 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 f0f1900..3137edb 100644 +index 5b72d57..df53f34 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml -@@ -67,12 +67,6 @@ tt.workspace = true +@@ -77,12 +77,6 @@ tt.workspace = true vfs-notify.workspace = true vfs.workspace = true @@ -315,27 +327,13 @@ index f0f1900..3137edb 100644 - [dev-dependencies] expect-test = "1.4.0" - jod-thread = "0.1.2" -diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml -index 642fb05..0883bb7 100644 ---- a/src/tools/rust-analyzer/crates/profile/Cargo.toml -+++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml -@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] } - [target.'cfg(target_os = "linux")'.dependencies] - perf-event = "0.4.7" - --[target.'cfg(windows)'.dependencies] --winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } -- - [features] - cpu_profiler = [] - + xshell = "0.2.2" diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml -index c881f2f..5cb4cb0 100644 +index a67f36a..bfbd00f 100644 --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml +++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml -@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", optional = true } - always-assert = { version = "0.1.2", features = ["log"] } +@@ -19,10 +19,6 @@ jod-thread = "0.1.2" + crossbeam-channel = "0.5.5" # Think twice before adding anything here -[target.'cfg(windows)'.dependencies] diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 8796a5c92..146c95eff 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -1,85 +1,101 @@ -From 1a6f5062adaad5d7f1a4f1cf792f4ee8c3c17e9f Mon Sep 17 00:00:00 2001 -From: Fabian Grünbichler <f.gruenbichler@proxmox.com> +From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> Date: Wed, 6 Sep 2023 13:23:24 -0600 Subject: [PATCH] Remove Windows dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> --- - vendor/anstream/Cargo.toml | 6 +---- + vendor/android-tzdata/Cargo.toml | 1 + + vendor/anstream/Cargo.toml | 6 ----- + vendor/anstyle-query/Cargo.toml | 7 ------ vendor/atty/Cargo.toml | 3 --- + vendor/backtrace-0.3.67/Cargo.toml | 14 ------------ vendor/backtrace/Cargo.toml | 13 ----------- - vendor/chrono/Cargo.toml | 11 --------- + vendor/chrono/Cargo.toml | 12 ---------- vendor/colored/Cargo.toml | 4 ---- - vendor/compiletest_rs/Cargo.toml | 6 ----- - vendor/concolor-query/Cargo.toml | 7 ------ - vendor/ctrlc/Cargo.toml | 18 --------------- vendor/curl-sys/Cargo.toml | 10 --------- vendor/curl/Cargo.toml | 10 --------- vendor/dirs-sys-next/Cargo.toml | 3 --- vendor/dirs-sys/Cargo.toml | 3 --- - vendor/errno-0.3.0/Cargo.toml | 7 ------ vendor/errno/Cargo.toml | 6 ----- vendor/fd-lock/Cargo.toml | 8 ------- - vendor/filetime-0.2.20/Cargo.toml | 7 ------ vendor/filetime/Cargo.toml | 7 ------ - vendor/gix-discover/Cargo.toml | 3 --- - vendor/gix-sec/Cargo.toml | 13 ----------- - vendor/home-0.5.4/Cargo.toml | 8 ------- + vendor/gix-sec/Cargo.toml | 12 ---------- vendor/home/Cargo.toml | 7 ------ vendor/iana-time-zone/Cargo.toml | 4 ---- - vendor/ignore-0.4.18/Cargo.toml | 2 -- vendor/ignore/Cargo.toml | 3 --- vendor/io-close/Cargo.toml | 3 --- - vendor/io-lifetimes-1.0.9/Cargo.toml | 13 ----------- vendor/io-lifetimes/Cargo.toml | 13 ----------- - vendor/is-terminal-0.4.6/Cargo.toml | 11 --------- + vendor/is-terminal-0.4.7/Cargo.toml | 11 --------- vendor/is-terminal/Cargo.toml | 11 --------- vendor/libloading/Cargo.toml | 7 ------ - vendor/libssh2-sys/Cargo.toml | 4 ---- + vendor/libssh2-sys/Cargo.toml | 5 ----- vendor/nu-ansi-term/Cargo.toml | 10 --------- - vendor/opener-0.5.0/Cargo.toml | 3 --- vendor/opener/Cargo.toml | 4 ---- vendor/os_info/Cargo.toml | 15 ------------- vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- - vendor/parking_lot_core-0.9.6/Cargo.toml | 9 -------- - vendor/parking_lot_core/Cargo.toml | 9 -------- + vendor/parking_lot_core/Cargo.toml | 3 --- vendor/pretty_assertions/Cargo.toml | 6 ----- - vendor/remove_dir_all/Cargo.toml | 3 --- - vendor/rustix-0.37.6/Cargo.toml | 12 ---------- - vendor/rustix-0.37.7/Cargo.toml | 12 ---------- + vendor/rustix-0.37.11/Cargo.toml | 11 --------- + vendor/rustix-0.37.20/Cargo.toml | 16 -------------- vendor/rustix/Cargo.toml | 17 -------------- vendor/same-file/Cargo.toml | 2 -- - vendor/snapbox/Cargo.toml | 11 --------- - vendor/socket2-0.4.1/Cargo.toml | 3 --- + vendor/snapbox/Cargo.toml | 6 ----- vendor/socket2/Cargo.toml | 8 ------- vendor/stacker/Cargo.toml | 10 --------- vendor/sysinfo/Cargo.toml | 38 -------------------------------- - vendor/tempfile-3.3.0/Cargo.toml | 3 --- vendor/tempfile/Cargo.toml | 7 ------ vendor/term/Cargo.toml | 6 ----- vendor/termcolor/Cargo.toml | 3 --- vendor/terminal_size/Cargo.toml | 7 ------ vendor/termize/Cargo.toml | 3 --- - vendor/tokio/Cargo.toml | 6 ----- + vendor/tokio/Cargo.toml | 21 ------------------ vendor/uuid/Cargo.toml | 4 ---- - vendor/walkdir-2.3.2/Cargo.toml | 6 ----- vendor/walkdir/Cargo.toml | 3 --- - 59 files changed, 1 insertion(+), 462 deletions(-) + vendor/yansi-term/Cargo.toml | 3 --- + 48 files changed, 1 insertion(+), 397 deletions(-) +diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml +index 805128a..0682717 100644 +--- a/vendor/android-tzdata/Cargo.toml ++++ b/vendor/android-tzdata/Cargo.toml +@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/android-tzdata" + + [dev-dependencies.zip] + version = "0.6.4" ++repository = "https://github.com/rust-cli/concolor" diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml -index eb04906..7e2ed64 100644 +index 75d78e2..a0eddb4 100644 --- a/vendor/anstream/Cargo.toml +++ b/vendor/anstream/Cargo.toml -@@ -137,8 +137,4 @@ default = [ +@@ -136,10 +136,4 @@ auto = [ + ] + default = [ "auto", - "wincon", +- "wincon", ] -wincon = ["dep:anstyle-wincon"] - -[target."cfg(windows)".dependencies.anstyle-wincon] --version = "0.2.0" +-version = "1.0.1" -optional = true -+wincon = [] +diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml +index 63a431c..0cf859b 100644 +--- a/vendor/anstyle-query/Cargo.toml ++++ b/vendor/anstyle-query/Cargo.toml +@@ -70,10 +70,3 @@ replace = """ + <!-- next-url --> + [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" + exactly = 1 +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_System_Console", +- "Win32_Foundation", +-] diff --git a/vendor/atty/Cargo.toml b/vendor/atty/Cargo.toml index d6bf2d0..7cebc31 100644 --- a/vendor/atty/Cargo.toml @@ -94,7 +110,7 @@ index d6bf2d0..7cebc31 100644 [badges.travis-ci] repository = "softprops/atty" diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml -index 96f4146..4a48f6e 100644 +index f33884a..b43a0dd 100644 --- a/vendor/backtrace/Cargo.toml +++ b/vendor/backtrace/Cargo.toml @@ -127,18 +127,5 @@ serialize-serde = ["serde"] @@ -117,10 +133,10 @@ index 96f4146..4a48f6e 100644 -version = "0.3.9" -optional = true diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml -index eaf0e69..79ab5f9 100644 +index 7f49bad..6229f0a 100644 --- a/vendor/chrono/Cargo.toml +++ b/vendor/chrono/Cargo.toml -@@ -114,7 +114,6 @@ __internal_bench = ["criterion"] +@@ -107,7 +107,6 @@ __internal_bench = ["criterion"] alloc = [] clock = [ "std", @@ -128,7 +144,7 @@ index eaf0e69..79ab5f9 100644 "iana-time-zone", ] default = [ -@@ -150,13 +149,3 @@ version = "0.3" +@@ -146,14 +145,3 @@ version = "0.1.1" version = "0.1.45" features = ["fallback"] optional = true @@ -140,6 +156,7 @@ index eaf0e69..79ab5f9 100644 - "minwinbase", - "minwindef", - "timezoneapi", +- "sysinfoapi", -] -optional = true diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml @@ -154,37 +171,8 @@ index 3a6b59b..065eecb 100644 -version = "0.3" -features = ["consoleapi", "processenv", "winbase"] -default-features = false -diff --git a/vendor/compiletest_rs/Cargo.toml b/vendor/compiletest_rs/Cargo.toml -index c1b3ecd..cae8c30 100644 ---- a/vendor/compiletest_rs/Cargo.toml -+++ b/vendor/compiletest_rs/Cargo.toml -@@ -75,9 +75,3 @@ tmp = ["tempfile"] - [target."cfg(unix)".dependencies.libc] - version = "0.2" - --[target."cfg(windows)".dependencies.miow] --version = "0.3" -- --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["winerror"] -diff --git a/vendor/concolor-query/Cargo.toml b/vendor/concolor-query/Cargo.toml -index a25ce89..c578c4c 100644 ---- a/vendor/concolor-query/Cargo.toml -+++ b/vendor/concolor-query/Cargo.toml -@@ -33,10 +33,3 @@ keywords = [ - categories = ["command-line-interface"] - license = "MIT OR Apache-2.0" - repository = "https://github.com/rust-cli/concolor" -- --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_System_Console", -- "Win32_Foundation", --] diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index 04b9800..4a4968d 100644 +index 6d89163..0b17324 100644 --- a/vendor/curl-sys/Cargo.toml +++ b/vendor/curl-sys/Cargo.toml @@ -73,16 +73,6 @@ zlib-ng-compat = [ @@ -239,10 +227,10 @@ index e9d8d0c..acb2eb7 100644 [badges.maintenance] status = "as-is" diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml -index 6c41007..4d79134 100644 +index 9951d24..0a86f4d 100644 --- a/vendor/dirs-sys/Cargo.toml +++ b/vendor/dirs-sys/Cargo.toml -@@ -23,6 +23,3 @@ version = "0.4" +@@ -22,6 +22,3 @@ version = "0.4" default-features = false [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -295,16 +283,15 @@ index 8547ec3..4ecd973 100644 - "Win32_Storage_FileSystem", -] diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml -index 44a3e884..041a6bb 100644 +index 254f82f..65248eb 100644 --- a/vendor/gix-sec/Cargo.toml +++ b/vendor/gix-sec/Cargo.toml -@@ -61,16 +61,3 @@ serde = [ - +@@ -63,15 +63,3 @@ serde = [ [target."cfg(not(windows))".dependencies.libc] version = "0.2.123" -- + -[target."cfg(windows)".dependencies.gix-path] --version = "^0.8.0" +-version = "^0.8.1" - -[target."cfg(windows)".dependencies.windows] -version = "0.48" @@ -331,7 +318,7 @@ index cd608b1..eecfb89 100644 - "Win32_UI_Shell", -] diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml -index 5cdc175..271a062 100644 +index e06c705..572a8fd 100644 --- a/vendor/iana-time-zone/Cargo.toml +++ b/vendor/iana-time-zone/Cargo.toml @@ -52,7 +52,3 @@ version = "0.1.5" @@ -365,7 +352,7 @@ index 5e36444..82f9ce5 100644 -version = "0.3.9" -features = ["handleapi", "std", "winsock2"] diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml -index b9ed913..0fd300a 100644 +index ef92ff0..c2733fb 100644 --- a/vendor/io-lifetimes/Cargo.toml +++ b/vendor/io-lifetimes/Cargo.toml @@ -43,7 +43,6 @@ optional = true @@ -393,10 +380,10 @@ index b9ed913..0fd300a 100644 -] -optional = true diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml -index 7957a9c..0ab2ae1 100644 +index e0baea0..7790abd 100644 --- a/vendor/is-terminal/Cargo.toml +++ b/vendor/is-terminal/Cargo.toml -@@ -53,14 +53,3 @@ features = ["termios"] +@@ -54,14 +54,3 @@ features = ["stdio"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] version = "0.3.0" @@ -427,7 +414,7 @@ index 65168d5..7785a7e 100644 - "libloaderapi", -] diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml -index 45f4a71..b0d3e26 100644 +index 45f4a71..f791ce9 100644 --- a/vendor/libssh2-sys/Cargo.toml +++ b/vendor/libssh2-sys/Cargo.toml @@ -43,7 +43,6 @@ version = "1.0.25" @@ -523,22 +510,16 @@ index 6981516..9fb8bd2 100644 - "handleapi", -] diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml -index 361186b..e00c191 100644 +index d76740d..7da23fc 100644 --- a/vendor/parking_lot_core/Cargo.toml +++ b/vendor/parking_lot_core/Cargo.toml -@@ -57,12 +57,3 @@ version = "0.2.8" +@@ -57,6 +57,3 @@ version = "0.3" [target."cfg(unix)".dependencies.libc] version = "0.2.95" - --[target."cfg(windows)".dependencies.windows-sys] --version = "0.45.0" --features = [ -- "Win32_Foundation", -- "Win32_System_LibraryLoader", -- "Win32_System_SystemServices", -- "Win32_System_WindowsProgramming", --] +-[target."cfg(windows)".dependencies.windows-targets] +-version = "0.48.0" diff --git a/vendor/pretty_assertions/Cargo.toml b/vendor/pretty_assertions/Cargo.toml index f8370f7..4531652 100644 --- a/vendor/pretty_assertions/Cargo.toml @@ -553,22 +534,54 @@ index f8370f7..4531652 100644 - -[target."cfg(windows)".dependencies.output_vt100] -version = "0.1.2" -diff --git a/vendor/remove_dir_all/Cargo.toml b/vendor/remove_dir_all/Cargo.toml -index a847288..aaf637f 100644 ---- a/vendor/remove_dir_all/Cargo.toml -+++ b/vendor/remove_dir_all/Cargo.toml -@@ -23,6 +23,3 @@ license = "MIT/Apache-2.0" - repository = "https://github.com/XAMPPRocky/remove_dir_all.git" - [dev-dependencies.doc-comment] - version = "0.3" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"] +diff --git a/vendor/rustix-0.37.11/Cargo.toml b/vendor/rustix-0.37.11/Cargo.toml +index a0ea91d..e5d57b1 100644 +--- a/vendor/rustix-0.37.11/Cargo.toml ++++ b/vendor/rustix-0.37.11/Cargo.toml +@@ -234,14 +234,3 @@ package = "errno" + version = "1.5.2" + optional = true + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_NetworkManagement_IpHelper", +- "Win32_System_Threading", +-] +- +-[target."cfg(windows)".dev-dependencies.ctor] +-version = "0.2.0" +diff --git a/vendor/rustix-0.37.20/Cargo.toml b/vendor/rustix-0.37.20/Cargo.toml +index 1a23dff..666da7b 100644 +--- a/vendor/rustix-0.37.20/Cargo.toml ++++ b/vendor/rustix-0.37.20/Cargo.toml +@@ -240,19 +240,3 @@ package = "errno" + 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" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_NetworkManagement_IpHelper", +- "Win32_System_Threading", +-] +- +-[target."cfg(windows)".dev-dependencies.ctor] +-version = "0.2.0" diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml -index c928526..6b7cff3 100644 +index dd40b25..95b35ba 100644 --- a/vendor/rustix/Cargo.toml +++ b/vendor/rustix/Cargo.toml -@@ -233,20 +233,3 @@ package = "errno" +@@ -235,20 +235,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -600,10 +613,10 @@ index 4f66820..11ef472 100644 -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml -index a9a74e1..8b0bf63 100644 +index 5ca8579..8f438dd 100644 --- a/vendor/snapbox/Cargo.toml +++ b/vendor/snapbox/Cargo.toml -@@ -161,7 +157,6 @@ cmd = [ +@@ -161,7 +161,6 @@ cmd = [ "dep:os_pipe", "dep:wait-timeout", "dep:libc", @@ -611,7 +624,7 @@ index a9a74e1..8b0bf63 100644 ] color = [ "dep:anstream", -@@ -196,8 +190,3 @@ structured-data = ["dep:serde_json"] +@@ -199,8 +198,3 @@ structured-data = ["dep:serde_json"] [target."cfg(unix)".dependencies.libc] version = "0.2.137" optional = true @@ -701,16 +714,16 @@ index f8719a4..deb2e40 100644 - "std", -] diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml -index 85006d8..013e986 100644 +index 1af1206..f665e00 100644 --- a/vendor/tempfile/Cargo.toml +++ b/vendor/tempfile/Cargo.toml -@@ -50,10 +50,3 @@ features = ["fs"] +@@ -53,10 +53,3 @@ features = ["fs"] [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] version = "0.3" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.45" +-version = "0.48" -features = [ - "Win32_Storage_FileSystem", - "Win32_Foundation", @@ -772,41 +785,62 @@ index d248f4d..9bd9f37 100644 [badges.cirrus-ci] repository = "JohnTitor/termize" diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml -index 11ec0c0..bf2ad39 100644 +index da1e4d1..55afa86 100644 --- a/vendor/tokio/Cargo.toml +++ b/vendor/tokio/Cargo.toml -@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "r - io-std = [] - io-util = ["memchr", "bytes"] - macros = ["tokio-macros"] --net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds", "winapi/namedpipeapi"] --process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry", "winapi/threadpoollegacyapiset"] -+net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds"] -+process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry"] +@@ -122,11 +122,6 @@ net = [ + "mio/os-ext", + "mio/net", + "socket2", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_Security", +- "windows-sys/Win32_Storage_FileSystem", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_System_SystemServices", + ] + process = [ + "bytes", +@@ -135,9 +130,6 @@ process = [ + "mio/os-ext", + "mio/net", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Threading", +- "windows-sys/Win32_System_WindowsProgramming", + ] rt = [] - rt-multi-thread = ["num_cpus", "rt"] --signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry", "winapi/consoleapi"] -+signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry"] + rt-multi-thread = [ +@@ -150,8 +142,6 @@ signal = [ + "mio/net", + "mio/os-ext", + "signal-hook-registry", +- "windows-sys/Win32_Foundation", +- "windows-sys/Win32_System_Console", + ] + stats = [] sync = [] - test-util = [] - time = [] -@@ -123,9 +123,3 @@ version = "0.2.42" - - [target."cfg(unix)".dev-dependencies.nix] - version = "0.22.0" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.8" +@@ -217,14 +207,3 @@ features = [ + "socket", + ] + default-features = false +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" -optional = true --default-features = false --[target."cfg(windows)".dev-dependencies.ntapi] --version = "0.3.6" +- +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Security_Authorization", +-] diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml -index b783688..4e98553 100644 +index b806036..4094678 100644 --- a/vendor/uuid/Cargo.toml +++ b/vendor/uuid/Cargo.toml -@@ -180,10 +180,6 @@ package = "wasm-bindgen" - [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] - version = "0.3" +@@ -185,10 +185,6 @@ version = "0.3" + version = "0.2" + package = "wasm-bindgen" -[target."cfg(windows)".dev-dependencies.windows-sys] -version = "0.48.0" diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch index 2d542a1e9..b02bcfafc 100644 --- a/debian/patches/d-armel-fix-lldb.patch +++ b/debian/patches/d-armel-fix-lldb.patch @@ -4,7 +4,7 @@ Index: rust/src/bootstrap/test.rs =================================================================== --- rust.orig/src/bootstrap/test.rs +++ rust/src/bootstrap/test.rs -@@ -1516,7 +1516,11 @@ note: if you're sure you want to do this +@@ -1631,7 +1631,11 @@ note: if you're sure you want to do this .ok(); if let Some(ref vers) = lldb_version { cmd.arg("--lldb-version").arg(vers); diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch index b7e3c457b..eab9c456b 100644 --- a/debian/patches/d-bootstrap-cargo-check-cfg.patch +++ b/debian/patches/d-bootstrap-cargo-check-cfg.patch @@ -5,7 +5,7 @@ Index: rust/src/bootstrap/builder.rs =================================================================== --- rust.orig/src/bootstrap/builder.rs +++ rust/src/bootstrap/builder.rs -@@ -1382,9 +1382,9 @@ impl<'a> Builder<'a> { +@@ -1358,9 +1358,9 @@ impl<'a> Builder<'a> { // complete list of features, so for that reason we don't enable checking of // features for std crates. cargo.arg(if mode != Mode::Std { diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index 248dc118c..dadecf9d0 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -106,7 +106,7 @@ Index: rust/src/doc/reference/src/conditional-compilation.md =================================================================== --- rust.orig/src/doc/reference/src/conditional-compilation.md +++ rust/src/doc/reference/src/conditional-compilation.md -@@ -370,6 +370,6 @@ println!("I'm running on a {} machine!", +@@ -376,6 +376,6 @@ println!("I'm running on a {} machine!", [`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute [attribute]: attributes.md [attributes]: attributes.md @@ -302,7 +302,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md =================================================================== --- rust.orig/src/doc/unstable-book/src/compiler-flags/sanitizer.md +++ rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md -@@ -793,7 +793,7 @@ It is strongly recommended to combine sa +@@ -804,7 +804,7 @@ It is strongly recommended to combine sa instrumented standard library, for example using [cargo `-Zbuild-std` functionality][build-std]. @@ -353,7 +353,7 @@ Index: rust/src/doc/rustc/src/platform-support/fuchsia.md =================================================================== --- rust.orig/src/doc/rustc/src/platform-support/fuchsia.md +++ rust/src/doc/rustc/src/platform-support/fuchsia.md -@@ -932,7 +932,7 @@ attach and load any relevant debug symbo +@@ -929,7 +929,7 @@ attach and load any relevant debug symbo [Fuchsia]: https://fuchsia.dev/ [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build [rustup]: https://rustup.rs/ diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch index e4a833155..e989666a1 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -12,7 +12,7 @@ Index: rust/src/bootstrap/lib.rs =================================================================== --- rust.orig/src/bootstrap/lib.rs +++ rust/src/bootstrap/lib.rs -@@ -1091,10 +1091,9 @@ impl Build { +@@ -1110,10 +1110,9 @@ impl Build { match which { GitRepo::Rustc => { diff --git a/debian/patches/d-bootstrap-install-symlinks.patch b/debian/patches/d-bootstrap-install-symlinks.patch index 00f84e0c7..5e4e125d9 100644 --- a/debian/patches/d-bootstrap-install-symlinks.patch +++ b/debian/patches/d-bootstrap-install-symlinks.patch @@ -13,24 +13,24 @@ Index: rust/src/tools/rust-installer/install-template.sh =================================================================== --- rust.orig/src/tools/rust-installer/install-template.sh +++ rust/src/tools/rust-installer/install-template.sh -@@ -616,7 +616,10 @@ install_components() { +@@ -617,7 +617,10 @@ install_components() { - maybe_backup_path "$_file_install_path" + maybe_backup_path "$_file_install_path" -- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" -+ if [ -h "$_src_dir/$_component/$_file" ] -+ then -+ run cp -d "$_src_dir/$_component/$_file" "$_file_install_path" -+ elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" - then - run cp "$_src_dir/$_component/$_file" "$_file_install_path" - run chmod 755 "$_file_install_path" -@@ -638,7 +641,7 @@ install_components() { +- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" ++ if [ -h "$_src_dir/$_component/$_file" ] ++ then ++ run cp -d "$_src_dir/$_component/$_file" "$_file_install_path" ++ elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" + then + run cp "$_src_dir/$_component/$_file" "$_file_install_path" + run chmod 755 "$_file_install_path" +@@ -639,7 +642,7 @@ install_components() { - maybe_backup_path "$_file_install_path" + maybe_backup_path "$_file_install_path" -- run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" -+ run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path" - critical_need_ok "failed to copy directory" +- run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" ++ run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path" + critical_need_ok "failed to copy directory" # Set permissions. 0755 for dirs, 644 for files diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch index c9d066619..0d9ff8973 100644 --- a/debian/patches/d-bootstrap-no-assume-tools.patch +++ b/debian/patches/d-bootstrap-no-assume-tools.patch @@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder/tests.rs =================================================================== --- rust.orig/src/bootstrap/builder/tests.rs +++ rust/src/bootstrap/builder/tests.rs -@@ -380,9 +380,13 @@ mod dist { +@@ -387,9 +387,13 @@ mod dist { #[test] fn dist_only_cross_host() { let b = TargetSelection::from_user("B"); diff --git a/debian/patches/d-bootstrap-old-cargo-compat.patch b/debian/patches/d-bootstrap-old-cargo-compat.patch deleted file mode 100644 index 0dacb4521..000000000 --- a/debian/patches/d-bootstrap-old-cargo-compat.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:39 +0200 -Subject: Backwards-compat for cargo 0.47 - - The flag being removed here was added in - https://github.com/rust-lang/cargo/pull/9404 released in cargo 0.54 - - This works around a feature introduced in this PR - https://github.com/rust-lang/cargo/pull/8640 released in cargo 0.53 - - Therefore it is not needed for Debian's current cargo 0.47. - - We can drop this patch when updating to cargo 0.54 and later. ---- - src/bootstrap/doc.rs | 3 --- - 1 file changed, 3 deletions(-) - -Index: rust/src/bootstrap/doc.rs -=================================================================== ---- rust.orig/src/bootstrap/doc.rs -+++ rust/src/bootstrap/doc.rs -@@ -613,7 +613,6 @@ fn doc_std( - .arg(&*target_dir.to_string_lossy()) - .arg("-p") - .arg(package) -- .arg("-Zskip-rustdoc-fingerprint") - .arg("--") - .arg("-Z") - .arg("unstable-options") -@@ -713,7 +712,6 @@ impl Step for Rustc { - cargo.rustdocflag("--generate-link-to-definition"); - compile::rustc_cargo(builder, &mut cargo, target, compiler.stage); - cargo.arg("-Zunstable-options"); -- cargo.arg("-Zskip-rustdoc-fingerprint"); - - // Only include compiler crates, no dependencies of those, such as `libc`. - // Do link to dependencies on `docs.rs` however using `rustdoc-map`. -@@ -846,7 +844,6 @@ macro_rules! tool_doc { - &[], - ); - -- cargo.arg("-Zskip-rustdoc-fingerprint"); - // Only include compiler crates, no dependencies of those, such as `libc`. - cargo.arg("--no-deps"); - $( diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch index 30e826d81..792b05c82 100644 --- a/debian/patches/d-bootstrap-rustflags.patch +++ b/debian/patches/d-bootstrap-rustflags.patch @@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder.rs =================================================================== --- rust.orig/src/bootstrap/builder.rs +++ rust/src/bootstrap/builder.rs -@@ -1409,6 +1409,18 @@ impl<'a> Builder<'a> { +@@ -1385,6 +1385,18 @@ impl<'a> Builder<'a> { } } diff --git a/debian/patches/d-bootstrap-use-local-css.patch b/debian/patches/d-bootstrap-use-local-css.patch index 1ea9ac86a..080cc9b85 100644 --- a/debian/patches/d-bootstrap-use-local-css.patch +++ b/debian/patches/d-bootstrap-use-local-css.patch @@ -11,7 +11,7 @@ Index: rust/src/bootstrap/doc.rs =================================================================== --- rust.orig/src/bootstrap/doc.rs +++ rust/src/bootstrap/doc.rs -@@ -360,7 +360,27 @@ impl Step for Standalone { +@@ -350,7 +350,27 @@ impl Step for Standalone { .arg("--index-page") .arg(&builder.src.join("src/doc/index.md")) .arg("--markdown-playground-url") @@ -40,7 +40,7 @@ Index: rust/src/bootstrap/doc.rs .arg("-o") .arg(&out) .arg(&path); -@@ -369,11 +389,6 @@ impl Step for Standalone { +@@ -359,11 +379,6 @@ impl Step for Standalone { cmd.arg("--disable-minification"); } diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch index 3f4b1dbe6..1e9f272f1 100644 --- a/debian/patches/d-disable-download-tests.patch +++ b/debian/patches/d-disable-download-tests.patch @@ -2,7 +2,7 @@ Index: rust/src/bootstrap/config/tests.rs =================================================================== --- rust.orig/src/bootstrap/config/tests.rs +++ rust/src/bootstrap/config/tests.rs -@@ -10,6 +10,9 @@ fn parse(config: &str) -> Config { +@@ -13,6 +13,9 @@ fn parse(config: &str) -> Config { #[test] fn download_ci_llvm() { @@ -12,7 +12,7 @@ Index: rust/src/bootstrap/config/tests.rs if crate::llvm::is_ci_llvm_modified(&parse("")) { eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change"); return; -@@ -38,7 +41,11 @@ fn download_ci_llvm() { +@@ -41,7 +44,11 @@ fn download_ci_llvm() { // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 #[test] fn detect_src_and_out() { diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index 99fd7e958..3431ebfff 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -12,7 +12,7 @@ Index: rust/vendor/rustix/build.rs use cc::Build; use std::env::var; use std::io::Write; -@@ -162,16 +161,16 @@ fn link_in_librustix_outline(arch: &str, +@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, println!("cargo:rerun-if-changed={}", to); // If "cc" is not enabled, use a pre-built library. @@ -36,7 +36,89 @@ Index: rust/vendor/rustix/Cargo.toml =================================================================== --- rust.orig/vendor/rustix/Cargo.toml +++ rust/vendor/rustix/Cargo.toml -@@ -127,7 +127,6 @@ version = "3.4.0" +@@ -117,7 +117,6 @@ version = "3.5.0" + + [build-dependencies.cc] + version = "1.0.68" +-optional = true + + [features] + all-apis = [ +Index: rust/vendor/rustix-0.37.11/build.rs +=================================================================== +--- rust.orig/vendor/rustix-0.37.11/build.rs ++++ rust/vendor/rustix-0.37.11/build.rs +@@ -1,4 +1,3 @@ +-#[cfg(feature = "cc")] + use cc::Build; + use std::env::var; + use std::io::Write; +@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, + println!("cargo:rerun-if-changed={}", to); + + // If "cc" is not enabled, use a pre-built library. +- #[cfg(not(feature = "cc"))] ++ /*#[cfg(not(feature = "cc"))] + { + let _ = asm_name; + println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); + println!("cargo:rustc-link-lib=static={}", name); +- } ++ }*/ + + // If "cc" is enabled, build the library from source, update the pre-built + // version, and assert that the pre-built version is checked in. +- #[cfg(feature = "cc")] ++ //#[cfg(feature = "cc")] + { + let out_dir = var("OUT_DIR").unwrap(); + // Add `-gdwarf-3` so that we always get the same output, regardless of +Index: rust/vendor/rustix-0.37.11/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix-0.37.11/Cargo.toml ++++ rust/vendor/rustix-0.37.11/Cargo.toml +@@ -117,7 +117,6 @@ version = "3.5.0" + + [build-dependencies.cc] + version = "1.0.68" +-optional = true + + [features] + all-apis = [ +Index: rust/vendor/rustix-0.37.20/build.rs +=================================================================== +--- rust.orig/vendor/rustix-0.37.20/build.rs ++++ rust/vendor/rustix-0.37.20/build.rs +@@ -1,4 +1,3 @@ +-#[cfg(feature = "cc")] + use cc::Build; + use std::env::var; + use std::io::Write; +@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, + println!("cargo:rerun-if-changed={}", to); + + // If "cc" is not enabled, use a pre-built library. +- #[cfg(not(feature = "cc"))] ++ /*#[cfg(not(feature = "cc"))] + { + let _ = asm_name; + println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); + println!("cargo:rustc-link-lib=static={}", name); +- } ++ }*/ + + // If "cc" is enabled, build the library from source, update the pre-built + // version, and assert that the pre-built version is checked in. +- #[cfg(feature = "cc")] ++ //#[cfg(feature = "cc")] + { + let out_dir = var("OUT_DIR").unwrap(); + // Add `-gdwarf-3` so that we always get the same output, regardless of +Index: rust/vendor/rustix-0.37.20/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix-0.37.20/Cargo.toml ++++ rust/vendor/rustix-0.37.20/Cargo.toml +@@ -117,7 +117,6 @@ version = "3.5.0" [build-dependencies.cc] version = "1.0.68" diff --git a/debian/patches/d-remove-arm-privacy-breaches.patch b/debian/patches/d-remove-arm-privacy-breaches.patch deleted file mode 100644 index 7bd488a0e..000000000 --- a/debian/patches/d-remove-arm-privacy-breaches.patch +++ /dev/null @@ -1,195 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:38 +0200 -Subject: d-remove-arm-privacy-breaches - -=================================================================== ---- - .../crates/stdarch-verify/arm-intrinsics.html | 134 --------------------- - 1 file changed, 134 deletions(-) - -Index: rust/library/stdarch/crates/stdarch-verify/arm-intrinsics.html -=================================================================== ---- rust.orig/library/stdarch/crates/stdarch-verify/arm-intrinsics.html -+++ rust/library/stdarch/crates/stdarch-verify/arm-intrinsics.html -@@ -20,17 +20,12 @@ - <meta name="keywords" content="">
- <meta content="Copyright © 1995-2018 Arm Limited (or its affiliates). All rights reserved." name="copyright">
- <meta name="apple-mobile-web-app-capable" content="yes">
--<meta name="msapplication-config" content="https://developer.arm.com:443/shared/common/img/favicon/browserconfig.xml">
--<meta name="msapplication-TileColor" content="#2b5797">
--<meta name="msapplication-TileImage" content="https://developer.arm.com:443/shared/common/img/favicon/mstile-144x144.png">
- <meta name="theme-color" content="#ffffff">
- <meta name="server" content="ARMGPCD2" />
-
- <meta property="og:title" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta property="og:description" content="All the NEON intrinsics reference in an interactive page.">
--<meta property="og:image" content="https://developer.arm.com:443">
- <meta property="og:site_name" content="ARM Developer">
--<meta property="og:url" content="https://developer.arm.com/technologies/neon/intrinsics">
- <meta property="og:type" content="website">
- <meta property="og:locale" content="en">
-
-@@ -41,64 +36,14 @@ - <meta name="twitter:site" content="ARM Developer">
- <meta name="twitter:title" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta name="twitter:description" content="All the NEON intrinsics reference in an interactive page.">
--<meta name="twitter:image" content="https://developer.arm.com:443">
--<meta name="twitter:url" content="https://developer.arm.com/technologies/neon/intrinsics">
-
- <meta itemprop="name" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta itemprop="description" content="All the NEON intrinsics reference in an interactive page.">
--<meta itemprop="image" content="https://developer.arm.com:443">
--
--
--
--
-- <link rel="stylesheet" type="text/css" href="/shared/developer.arm.com/css/app.css?v=D41D8CD98F00B204E9800998ECF8427E" />
--
--
--
--<link rel="apple-touch-icon" sizes="57x57" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="60x60" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="72x72" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="76x76" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="114x114" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="120x120" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="144x144" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="152x152" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="180x180" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-32x32.png?v=2.29.0.0" sizes="32x32" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-48x48.png?v=2.29.0.0" sizes="48x48" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/android-chrome-192x192.png?v=2.29.0.0" sizes="192x192" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/android-chrome-256x256.png?v=2.29.0.0" sizes="256x256" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-16x16.png?v=2.29.0.0" sizes="16x16" />
--<link rel="shortcut icon" type="image/ico" href="https://developer.arm.com/shared/common/img/favicon/favicon.ico?v=2.29.0.0" />
--<link rel="manifest" href="https://developer.arm.com/shared/common/img/favicon/manifest.json?v=2.29.0.0" />
--
-- <link rel="search" type="application/opensearchdescription+xml" title="ARM Developer" href="/opensearch.xml"/>
--
--
--
--
--
--<!-- Google Tag Manager -->
--<script>
--(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
--new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
--j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
--'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-- })(window, document, 'script', 'dataLayer', 'GTM-K25LQR');
--</script>
--<!-- End Google Tag Manager -->
--
--
- </head>
- <body id="">
-
-
-
--<noscript>
-- <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K25LQR" height="0" width="0" style="display:none;visibility:hidden"></iframe>
--</noscript>
--
--
-
- <div class="c-feedback-message-container u-no-print"><style> - /* Docs top margin fix */ -@@ -245,7 +190,6 @@ j=d.createElement(s),dl=l!='dataLayer'?' - <span class="navigation-dropdown-label">
- <a href="/">
- <span>
-- <img src="/shared/developer.arm.com/img/arm-developer.svg" alt="ARM Developer" />
- </span>
- <i class="fa fa-caret-down"></i>
- </a>
-@@ -437,7 +381,6 @@ j=d.createElement(s),dl=l!='dataLayer'?' -
- </div>
-
--<link rel="stylesheet" href="https://developer.arm.com/shared/arm-account/css/modules/user-menu.css?v=2.29.0.0" />
-
- </li>
- </ul>
-@@ -93318,82 +93261,5 @@ names are the property of their respecti -
- </div>
-
--<script type="text/javascript" src="https://nebula-cdn.kampyle.com/we/8144/onsite/embed.js"></script>
--
--
--
--
--<script src="/bundles/modernizr?v=inCVuEFe6J4Q07A0AcRsbJic_UE5MwpRMNGcOtk94TE1"></script>
--
--
--
--<script type="text/javascript">
-- if (Modernizr && !Modernizr.svg) {
-- var imgs = document.getElementsByTagName('img');
-- var svgExtension = /.*\.svg$/;
-- var l = imgs.length;
-- for (var i = 0; i < l; i++) {
-- if (imgs[i].src.match(svgExtension)) {
-- imgs[i].src = imgs[i].src.slice(0, -3) + 'png';
-- }
-- }
-- }
--</script>
--
--
--<script src="/shared/vendor/jquery-1.12.4.min.js"></script>
--<script src="/shared/vendor/foundation.min.js"></script>
--<script src="/shared/vendor/moment.min.js"></script>
--<script src="/shared/vendor/js/jquery-rss/src/jquery.rss.js"></script>
--
--<script src="/bundles/clipboard?v=IPc2U7tMxf_2TKh6_qbfzIsYI3pmBbWZxHb5M8V-fhg1"></script>
--
--<script src="/bundles/placeholder?v=Aw-bm4sJPSuBeTzPpRw_GfXYXI4wKmH607vgMic22c01"></script>
--
--<script src="/bundles/waypoints?v=E5Sm2NPVxzLqGyd5lIz-NjBvArn4w7w7IvCs35wz6dA1"></script>
--
--
--
--<script src="/shared/developer.arm.com/js/common.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script src="/shared/developer.arm.com/js/app.bundle.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--
--
--<script src="/shared/arm.com-new/js/app.constants.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script src="/shared/arm.com-new/js/app.navigation.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script type="text/javascript">
-- (function() {
-- var $userMenu = $('.c-user-menu__root');
-- if ($userMenu) {
-- $userMenu.navigation();
-- }
-- })();
--</script>
--
--
--
--<script src="/bundles/jquery-ui?v=atr-jO-t-9RdxuVusckf7yNy0MEEBlVW5TaJCAetR6A1"></script>
--
--<script src="/bundles/jqueryval?v=shBfM8gvrYJt6eNs9xKMaOYfzyGdVGLhvPUMJ92MwmM1"></script>
--
--<script src="/sitecore%20modules/Web/Web%20Forms%20for%20Marketers/mvc/wffm.min.js"></script>
--<script>
-- $(document).ready(function() {
-- $("form[data-wffm]").each(function() { $(this).wffmForm(); });
-- });
--</script>
--
--<link rel="stylesheet" type="text/css" href="//fast.fonts.net/t/1.css?apiType=css&projectid=5616bfa5-8ba9-4061-8e15-3a2d29551ced" />
--
--
--<script src="//munchkin.marketo.net/munchkin.js" type="text/javascript"></script>
--<script type="text/javascript">
-- Munchkin.init('312-SAX-488', {'asyncOnly': true});
--</script>
--
--
--
--
--
--
- </body>
- </html>
diff --git a/debian/patches/d-rustc-add-soname.patch b/debian/patches/d-rustc-add-soname.patch index 03dc0ba6d..29c56a614 100644 --- a/debian/patches/d-rustc-add-soname.patch +++ b/debian/patches/d-rustc-add-soname.patch @@ -28,7 +28,7 @@ Index: rust/compiler/rustc_codegen_ssa/src/back/link.rs =================================================================== --- rust.orig/compiler/rustc_codegen_ssa/src/back/link.rs +++ rust/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -2359,6 +2359,13 @@ fn add_order_independent_options( +@@ -2363,6 +2363,13 @@ fn add_order_independent_options( } add_rpath_args(cmd, sess, codegen_results, out_filename); diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch deleted file mode 100644 index faee1685e..000000000 --- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> -Date: Thu, 14 Jul 2022 13:17:39 +0200 -Subject: d-rustc-fix-mips64el-bootstrap - -Bug: https://github.com/rust-lang/rust/issues/52108 - -=================================================================== ---- - compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs | 2 +- - compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs | 2 +- - src/bootstrap/bootstrap.py | 2 ++ - src/test/assembly/asm/mips-types.rs | 1 + - 4 files changed, 5 insertions(+), 2 deletions(-) - -Index: rust/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs -+++ rust/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs -@@ -12,7 +12,7 @@ pub fn target() -> Target { - endian: Endian::Big, - // NOTE(mips64r2) matches C toolchain - cpu: "mips64r2".into(), -- features: "+mips64r2".into(), -+ features: "+mips64r2,+xgot".into(), - max_atomic_width: Some(64), - mcount: "_mcount".into(), - -Index: rust/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs -=================================================================== ---- rust.orig/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs -+++ rust/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs -@@ -10,7 +10,7 @@ pub fn target() -> Target { - abi: "abi64".into(), - // NOTE(mips64r2) matches C toolchain - cpu: "mips64r2".into(), -- features: "+mips64r2".into(), -+ features: "+mips64r2,+xgot".into(), - max_atomic_width: Some(64), - mcount: "_mcount".into(), - -Index: rust/src/bootstrap/bootstrap.py -=================================================================== ---- rust.orig/src/bootstrap/bootstrap.py -+++ rust/src/bootstrap/bootstrap.py -@@ -877,6 +877,8 @@ class RustBuild(object): - - # preserve existing RUSTFLAGS - env.setdefault("RUSTFLAGS", "") -+ if self.build_triple().startswith('mips'): -+ env["RUSTFLAGS"] += " -Ctarget-feature=+xgot" - target_features = [] - if self.get_toml("crt-static", build_section) == "true": - target_features += ["+crt-static"] -Index: rust/tests/assembly/asm/mips-types.rs -=================================================================== ---- rust.orig/tests/assembly/asm/mips-types.rs -+++ rust/tests/assembly/asm/mips-types.rs -@@ -1,3 +1,4 @@ -+// ignore-test - // revisions: mips32 mips64 - // assembly-output: emit-asm - //[mips32] compile-flags: --target mips-unknown-linux-gnu diff --git a/debian/patches/d-rustdoc-disable-embedded-fonts.patch b/debian/patches/d-rustdoc-disable-embedded-fonts.patch index 99fa7d251..7d8bab9f5 100644 --- a/debian/patches/d-rustdoc-disable-embedded-fonts.patch +++ b/debian/patches/d-rustdoc-disable-embedded-fonts.patch @@ -13,7 +13,7 @@ Index: rust/src/librustdoc/html/static/css/rustdoc.css =================================================================== --- rust.orig/src/librustdoc/html/static/css/rustdoc.css +++ rust/src/librustdoc/html/static/css/rustdoc.css -@@ -79,14 +79,6 @@ +@@ -80,14 +80,6 @@ font-display: swap; } diff --git a/debian/patches/series b/debian/patches/series index 95572141b..006ad623d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,13 +41,11 @@ d-0012-cargo-always-return-dev-channel.patch ## Patches to the build process, including doc path tweaks ## Should not change resulting rustc behaviour d-bootstrap-rustflags.patch -d-remove-arm-privacy-breaches.patch d-bootstrap-install-symlinks.patch d-bootstrap-disable-git.patch d-bootstrap-no-assume-tools.patch d-bootstrap-cargo-doc-paths.patch d-bootstrap-use-local-css.patch -d-bootstrap-old-cargo-compat.patch d-bootstrap-custom-debuginfo-path.patch d-bootstrap-permit-symlink-in-docs.patch d-test-ignore-avx-44056.patch @@ -63,7 +61,6 @@ d-armel-fix-lldb.patch d-rust-gdb-paths d-rust-lldb-paths d-rustc-add-soname.patch -d-rustc-fix-mips64el-bootstrap.patch d-rustc-windows-ssp.patch d-rustc-i686-baseline.patch # Experimental patch not yet working diff --git a/debian/patches/u-disable-fp-precision-test-on-i386.patch b/debian/patches/u-disable-fp-precision-test-on-i386.patch index dad261349..d4845c9d0 100644 --- a/debian/patches/u-disable-fp-precision-test-on-i386.patch +++ b/debian/patches/u-disable-fp-precision-test-on-i386.patch @@ -15,7 +15,7 @@ Index: rust/library/core/src/num/f32.rs =================================================================== --- rust.orig/library/core/src/num/f32.rs +++ rust/library/core/src/num/f32.rs -@@ -799,7 +799,7 @@ impl f32 { +@@ -800,7 +800,7 @@ impl f32 { /// let angle = std::f32::consts::PI; /// /// let abs_difference = (angle.to_degrees() - 180.0).abs(); diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch index 4b5bcb6d5..1aff8de0f 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/u-fix-get-toml-when-test.patch @@ -10,7 +10,7 @@ Index: rust/src/bootstrap/config.rs =================================================================== --- rust.orig/src/bootstrap/config.rs +++ rust/src/bootstrap/config.rs -@@ -931,9 +931,32 @@ impl Config { +@@ -1040,9 +1040,32 @@ impl Config { pub fn parse(args: &[String]) -> Config { #[cfg(test)] diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch index f83e4fcbc..e7c1a3ced 100644 --- a/debian/patches/u-profiler.patch +++ b/debian/patches/u-profiler.patch @@ -14,9 +14,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. src/bootstrap/config.rs | 30 ++++++++++++++++++++++++------ 4 files changed, 38 insertions(+), 8 deletions(-) ---- a/config.example.toml -+++ b/config.example.toml -@@ -745,8 +745,10 @@ changelog-seen = 2 +Index: rust/config.example.toml +=================================================================== +--- rust.orig/config.example.toml ++++ rust/config.example.toml +@@ -752,8 +752,10 @@ changelog-seen = 2 # This option will override the same option under [build] section. #sanitizers = build.sanitizers (bool) @@ -29,8 +31,10 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. # This option will override the same option under [build] section. #profiler = build.profiler (bool) ---- a/library/profiler_builtins/build.rs -+++ b/library/profiler_builtins/build.rs +Index: rust/library/profiler_builtins/build.rs +=================================================================== +--- rust.orig/library/profiler_builtins/build.rs ++++ rust/library/profiler_builtins/build.rs @@ -6,6 +6,12 @@ use std::env; use std::path::Path; @@ -44,9 +48,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. let target = env::var("TARGET").expect("TARGET was not set"); let cfg = &mut cc::Build::new(); ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, +Index: rust/src/bootstrap/compile.rs +=================================================================== +--- rust.orig/src/bootstrap/compile.rs ++++ rust/src/bootstrap/compile.rs +@@ -336,6 +336,10 @@ pub fn std_cargo(builder: &Builder<'_>, cargo.env("MACOSX_DEPLOYMENT_TARGET", target); } @@ -57,9 +63,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. // Determine if we're going to compile in optimized C intrinsics to // the `compiler-builtins` crate. These intrinsics live in LLVM's // `compiler-rt` repository, but our `src/llvm-project` submodule isn't ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -467,7 +467,7 @@ pub struct Target { +Index: rust/src/bootstrap/config.rs +=================================================================== +--- rust.orig/src/bootstrap/config.rs ++++ rust/src/bootstrap/config.rs +@@ -533,7 +533,7 @@ pub struct Target { pub linker: Option<PathBuf>, pub ndk: Option<PathBuf>, pub sanitizers: Option<bool>, @@ -68,7 +76,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. pub rpath: Option<bool>, pub crt_static: Option<bool>, pub musl_root: Option<PathBuf>, -@@ -796,9 +796,9 @@ define_config! { +@@ -862,9 +862,9 @@ define_config! { } } @@ -80,7 +88,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. String(String), Bool(bool), } -@@ -809,6 +809,12 @@ impl Default for StringOrBool { +@@ -976,6 +976,12 @@ define_config! { } } @@ -91,9 +99,9 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. +} + define_config! { - /// TOML representation of how the Rust build is configured. - struct Rust { -@@ -880,7 +886,7 @@ define_config! { + /// TOML representation of how each build target is configured. + struct TomlTarget { +@@ -991,7 +997,7 @@ define_config! { llvm_libunwind: Option<String> = "llvm-libunwind", android_ndk: Option<String> = "android-ndk", sanitizers: Option<bool> = "sanitizers", @@ -102,7 +110,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable. rpath: Option<bool> = "rpath", crt_static: Option<bool> = "crt-static", musl_root: Option<String> = "musl-root", -@@ -1744,12 +1750,24 @@ impl Config { +@@ -1887,12 +1893,24 @@ impl Config { self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers } diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch index faa70d7fa..341d5f0af 100644 --- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch +++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch @@ -20,7 +20,7 @@ Index: rust/compiler/rustc_lint/src/builtin.rs =================================================================== --- rust.orig/compiler/rustc_lint/src/builtin.rs +++ rust/compiler/rustc_lint/src/builtin.rs -@@ -3102,7 +3102,10 @@ declare_lint! { +@@ -3112,7 +3112,10 @@ declare_lint! { /// ### Example /// /// ```rust,compile_fail diff --git a/debian/rules b/debian/rules index c7b05413c..eb6a2a4d1 100755 --- a/debian/rules +++ b/debian/rules @@ -332,10 +332,10 @@ endif ifneq (,$(filter $(DEB_BUILD_ARCH), mipsel)) FAILURES_ALLOWED = 25 endif -ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64 s390x)) +ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64 s390x riscv64)) FAILURES_ALLOWED = 40 endif -ifneq (,$(filter $(DEB_BUILD_ARCH), powerpc powerpcspe riscv64 sparc64 x32)) +ifneq (,$(filter $(DEB_BUILD_ARCH), loong64 powerpc powerpcspe sparc64 x32)) FAILURES_ALLOWED = 180 endif FAILED_TESTS = grep "FAILED\|^command did not execute successfully" $(TEST_LOG) | grep -v '^test result: FAILED' | grep -v 'FAILED (allowed)' @@ -517,7 +517,7 @@ override_dh_dwz: dh_dwz --no-dwz-multifile override_dh_makeshlibs: - dh_makeshlibs -V + dh_makeshlibs -V -N $(LIBSTD_PKG) # dh_makeshlibs doesn't support our "libfoo-version.so" naming # structure, so we have to do this ourselves. diff --git a/debian/upstream-tarball-unsuspicious.txt b/debian/upstream-tarball-unsuspicious.txt index 0d3d51bcb..821c42087 100644 --- a/debian/upstream-tarball-unsuspicious.txt +++ b/debian/upstream-tarball-unsuspicious.txt @@ -12,7 +12,6 @@ src/doc/reference/src/items/modules.md src/doc/reference/src/types-redirect.html src/tools/cargo/src/doc/src/reference/registries.md src/tools/clippy/book/src/lint_configuration.md -vendor/chalk-solve-0.87.0/src/infer/test.rs vendor/fiat-crypto/src/p448_solinas_32.rs vendor/itertools*/examples/iris.data vendor/minifier/src/js/tools.rs @@ -61,6 +60,7 @@ src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md src/doc/rustc/src/targets/known-issues.md src/doc/rustdoc/src/*.md +src/doc/style-guide/src/nightly.md src/doc/unstable-book/src/*/*.md src/etc/completions/x.py.sh src/etc/third-party/README.txt @@ -69,13 +69,13 @@ src/librustdoc/html/static/scrape-examples-help.md src/tools/cargo/src/cargo/sources/git/known_hosts.rs src/tools/cargo/src/doc/src/guide/continuous-integration.md src/tools/cargo/src/doc/src/reference/features.md +src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs src/tools/rust-analyzer/crates/ide-completion/src/completions/env_vars.rs src/tools/rust-analyzer/crates/rust-analyzer/src/diagnostics/to_proto.rs 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/mir-opt/inline/inline_generator.main.Inline.diff 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 @@ -100,8 +100,6 @@ vendor/anstyle-parse/src/state/table.rs vendor/base64ct/tests/proptests.proptest-regressions vendor/chrono/src/offset/local/tz_info/rule.rs vendor/chrono/src/offset/local/tz_info/timezone.rs -vendor/clap-*/examples/demo.md -vendor/clap-*/examples/tutorial_*/*.md vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xmd.rs vendor/elliptic-curve/src/hash2curve/hash2field/expand_msg/xof.rs vendor/elliptic-curve/src/jwk.rs @@ -155,15 +153,13 @@ src/tools/rustdoc-gui/.eslintrc.js src/tools/rustdoc-gui/tester.js src/tools/rustdoc-js/.eslintrc.js src/tools/rustdoc-js/tester.js -vendor/cxx/book/build.js -vendor/cxx/book/package-lock.json -vendor/cxx/book/package.json vendor/libz-sys/src/smoke.c vendor/openssl-sys/build/expando.c vendor/signal-hook/src/low_level/extract.c vendor/wasm-bindgen-macro/src/worker.js vendor/wasm-bindgen/_package.json vendor/wasm-bindgen/examples/import_js/package.json +vendor/wasm-bindgen/webdriver.json # Embedded libraries, justified in README.source vendor/dlmalloc/src/dlmalloc.c @@ -179,6 +175,7 @@ vendor/stacker/src/arch/windows.c # False-positive, misc src/ci/github-actions/problem_matchers.json +src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore src/doc/rustc-dev-guide/src/queries/example-0.counts.txt src/etc/rust_analyzer_settings.json src/stage0.json @@ -205,10 +202,10 @@ src/doc/nomicon/src/img/safeandunsafe.svg src/doc/rustc-dev-guide/src/img/*.png src/doc/rustc-dev-guide/src/queries/example-0.png src/doc/rustc/src/images/*.png -src/etc/installer/gfx/ -src/librustdoc/html/static/images/*.svg src/doc/rustdoc/src/images/collapsed-long-item.png src/doc/rustdoc/src/images/collapsed-trait-impls.png +src/etc/installer/gfx/ +src/librustdoc/html/static/images/*.svg src/librustdoc/html/static/images/favicon-*.png src/tools/cargo/src/doc/src/images/Cargo-Logo-Small.png src/tools/cargo/src/doc/src/images/auth-level-acl.png @@ -219,8 +216,12 @@ src/tools/cargo/src/doc/src/images/org-level-acl.png src/tools/cargo/src/doc/src/images/winapi-features.svg src/tools/cargo/src/doc/theme/favicon.png src/tools/rust-analyzer/assets/logo-*.svg -vendor/cxx/book/src/cxx.png -vendor/cxx/book/src/overview.svg +vendor/color-eyre/pictures/custom_section.png +vendor/color-eyre/pictures/full.png +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 @@ -239,8 +240,8 @@ library/portable-simd/crates/core_simd/webdriver.json library/std/src/sys/windows/path/tests.rs library/stdarch/ci/gba.json library/stdarch/crates/std_detect/src/detect/test_data/*.auxv -library/stdarch/crates/stdarch-verify/arm-intrinsics.html library/stdarch/crates/stdarch-verify/x86-intel.xml +library/stdarch/intrinsics_data/arm_intrinsics.json src/tools/*/tests/*/*.stderr src/tools/cargo/benches/workspaces/*.tgz src/tools/cargo/crates/mdman/tests/compare/expected/formatting.txt @@ -280,19 +281,19 @@ tests/rustdoc-gui/src/huge_logo/src/lib.rs tests/rustdoc-gui/src/scrape_examples/examples/check-many-*.rs tests/rustdoc-js-std/*.js tests/rustdoc-js/*.js +tests/ui/higher-ranked/trait-bounds/hang-on-deeply-nested-dyn.stderr tests/ui/macros/not-utf8.bin tests/ui/nll/*/*.stderr tests/ui/parser/issues/*.stderr tests/ui/proc-macro/debug/*.stderr tests/ui/rfcs/rfc-3348-c-string-literals/no-nuls.stderr +tests/ui/traits/object/print_vtable_sizes.stdout vendor/annotate-snippets/tests/fixtures/no-color/strip_line_non_ws.toml vendor/basic-toml/tests/invalid-encoder/array-mixed-types-ints-and-floats.json vendor/basic-toml/tests/valid/*.json vendor/basic-toml/tests/valid/table-whitespace.toml vendor/bstr/src/unicode/fsm/*.dfa vendor/cargo_metadata*/tests/test_samples.rs -vendor/codespan-reporting/tests/snapshots/term__position_indicator__rich_ascii_no_color.snap -vendor/codespan-reporting/tests/snapshots/term__position_indicator__rich_no_color.snap vendor/content_inspector/testdata/* vendor/csv/examples/data/*.csv vendor/csv/examples/data/bench/*.csv @@ -303,11 +304,13 @@ vendor/elasticlunr-rs/tests/data/*.in.txt vendor/elasticlunr-rs/tests/searchindex_fixture_*.json vendor/elliptic-curve/tests/examples/*.der vendor/elliptic-curve/tests/examples/*.pem +vendor/flate2/examples/hello_world.txt.gz vendor/flate2/tests/*.gz vendor/flate2/tests/corrupt-gz-file.bin vendor/fluent-syntax/benches/parser.rs vendor/gimli*/fixtures/self/* vendor/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz +vendor/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz vendor/gsgdt/tests/*.json vendor/handlebars/tests/helper_with_space.rs vendor/hkdf/tests/data/*.blb @@ -344,7 +347,6 @@ vendor/pasetors/test_vectors/*.json vendor/pasetors/test_vectors/*/*.json vendor/pem-rfc7468/tests/examples/*.der vendor/pem-rfc7468/tests/examples/*.pem -vendor/petgraph/tests/res/*.txt vendor/pkcs8/tests/examples/*.der vendor/pkcs8/tests/examples/*.pem vendor/pkcs8/tests/private_key.rs @@ -353,6 +355,8 @@ 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/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 vendor/regex/tests/crates_regex.rs vendor/regex/tests/fowler.rs @@ -379,6 +383,7 @@ vendor/vte/tests/demo.vte vendor/walkdir/compare/nftw.c vendor/wasm-bindgen/tests/headless/* vendor/wasm-bindgen/tests/wasm/* +vendor/wasm-bindgen/tests/worker/modules.js vendor/web-sys/tests/wasm/*.js vendor/zerovec/benches/testdata/*.postcard vendor/zip/tests/data/*.zip @@ -429,12 +434,13 @@ src/tools/rustfmt/src/formatting.rs src/tools/rustfmt/src/lib.rs src/tools/rustfmt/src/parse/parser.rs src/tools/rustfmt/src/string.rs -vendor/ahash-0.7.4/src/hash_quality_test.rs -vendor/ahash-0.7.4/src/lib.rs +vendor/ahash-0.7.6/src/hash_quality_test.rs +vendor/ahash-0.7.6/src/lib.rs vendor/ahash/src/fallback_hash.rs vendor/ahash/src/hash_quality_test.rs vendor/ahash/src/lib.rs -vendor/aho-corasick/src/nfa.rs +vendor/aho-corasick-0.7.20/src/nfa.rs +vendor/aho-corasick/src/ahocorasick.rs vendor/base16ct/benches/mod.rs vendor/base16ct/src/lower.rs vendor/base16ct/src/mixed.rs @@ -443,6 +449,7 @@ vendor/base64/src/decode.rs vendor/base64/src/encode.rs vendor/base64ct/src/*.rs vendor/base64ct/tests/*.rs +vendor/bitflags/src/traits.rs vendor/block-buffer/tests/mod.rs vendor/camino/src/serde_impls.rs vendor/clap*/src/derive.rs @@ -453,9 +460,6 @@ vendor/clap_derive/src/derives/value_enum.rs vendor/compiler_builtins/libm/src/math/atan.rs vendor/csv-core/src/reader.rs vendor/csv-core/src/writer.rs -vendor/cxx-build/src/gen/file.rs -vendor/cxx-build/src/syntax/qualified.rs -vendor/cxxbridge-macro/src/syntax/qualified.rs vendor/datafrog/src/lib.rs vendor/derive_more/src/*.rs vendor/digest/src/core_api/rt_variable.rs @@ -537,6 +541,7 @@ vendor/rayon/tests/sort-panic-safe.rs vendor/regex-automata-0.1.10/src/regex.rs vendor/rustc-rayon/tests/sort-panic-safe.rs vendor/rustversion/src/attr.rs +vendor/rustversion/src/expand.rs vendor/rustversion/src/lib.rs vendor/semver/src/parse.rs vendor/serde_cbor/tests/de.rs @@ -587,18 +592,17 @@ vendor/winnow/examples/json/parser_dispatch.rs vendor/winnow/examples/json/parser_partial.rs vendor/winnow/examples/ndjson/example.ndjson vendor/winnow/examples/ndjson/parser.rs -vendor/winnow/src/bits/mod.rs -vendor/winnow/src/bits/tests.rs -vendor/winnow/src/branch/mod.rs -vendor/winnow/src/branch/tests.rs -vendor/winnow/src/bytes/mod.rs -vendor/winnow/src/character/mod.rs -vendor/winnow/src/combinator/mod.rs +vendor/winnow/src/ascii/mod.rs +vendor/winnow/src/binary/mod.rs +vendor/winnow/src/binary/bits/mod.rs +vendor/winnow/src/binary/bits/tests.rs +vendor/winnow/src/combinator/branch.rs +vendor/winnow/src/combinator/core.rs +vendor/winnow/src/combinator/parser.rs +vendor/winnow/src/combinator/sequence.rs vendor/winnow/src/combinator/tests.rs vendor/winnow/src/error.rs -vendor/winnow/src/multi/tests.rs -vendor/winnow/src/number/mod.rs -vendor/winnow/src/sequence/mod.rs +vendor/winnow/src/token/mod.rs vendor/xz2/src/bufread.rs vendor/xz2/src/stream.rs vendor/yansi/src/tests.rs |