mirror of
https://git.proxmox.com/git/rustc
synced 2026-08-20 21:26:16 +00:00
Merge commit '32bd2b0ba' into debian/experimental
This commit is contained in:
Ximin Luo
commit
bcfd45baab
3
debian/config.toml.in
vendored
3
debian/config.toml.in
vendored
@ -19,6 +19,9 @@ target = ["DEB_TARGET_RUST_TYPE"]
|
||||
# we do it this way to avoid spurious rebuilds
|
||||
docs = false
|
||||
|
||||
extended = true
|
||||
tools = ["clippy", "rustfmt"]
|
||||
|
||||
[install]
|
||||
prefix = "/usr"
|
||||
|
||||
|
||||
48
debian/control
vendored
48
debian/control
vendored
@ -254,3 +254,51 @@ Description: Rust systems programming language - source code
|
||||
.
|
||||
This package contains sources of the Rust compiler and standard
|
||||
libraries, useful for IDEs and code analysis tools such as Racer.
|
||||
|
||||
Package: rust-clippy
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends},
|
||||
libstd-rust-1.48
|
||||
Recommends: cargo
|
||||
Description: Rust linter
|
||||
Rust is a curly-brace, block-structured expression language. It
|
||||
visually resembles the C language family, but differs significantly
|
||||
in syntactic and semantic details. Its design is oriented toward
|
||||
concerns of "programming in the large", that is, of creating and
|
||||
maintaining boundaries - both abstract and operational - that
|
||||
preserve large-system integrity, availability and concurrency.
|
||||
.
|
||||
It supports a mixture of imperative procedural, concurrent actor,
|
||||
object-oriented and pure functional styles. Rust also supports
|
||||
generic programming and meta-programming, in both static and dynamic
|
||||
styles.
|
||||
.
|
||||
This package contains 'clippy', a linter to catch common mistakes and improve
|
||||
your Rust code as well a collection of over 400 compatible lints.
|
||||
.
|
||||
Lints are divided into categories, each with a default lint level. You can
|
||||
choose how much Clippy is supposed to annoy help you by changing the lint
|
||||
level by category.
|
||||
.
|
||||
Clippy is integrated into the 'cargo' build tool, available via 'cargo clippy'.
|
||||
|
||||
Package: rustfmt
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends},
|
||||
Recommends: cargo
|
||||
Description: Rust formatting helper
|
||||
Rust is a curly-brace, block-structured expression language. It
|
||||
visually resembles the C language family, but differs significantly
|
||||
in syntactic and semantic details. Its design is oriented toward
|
||||
concerns of "programming in the large", that is, of creating and
|
||||
maintaining boundaries - both abstract and operational - that
|
||||
preserve large-system integrity, availability and concurrency.
|
||||
.
|
||||
It supports a mixture of imperative procedural, concurrent actor,
|
||||
object-oriented and pure functional styles. Rust also supports
|
||||
generic programming and meta-programming, in both static and dynamic
|
||||
styles.
|
||||
.
|
||||
This package contains 'rustfmt', a tool for formatting Rust code according to
|
||||
style guidelines, as well as 'cargo-fmt', a helper enabling running rustfmt
|
||||
directly with 'cargo fmt'.
|
||||
|
||||
266
debian/copyright
vendored
266
debian/copyright
vendored
@ -22,19 +22,23 @@ Files-Excluded:
|
||||
# cargo's own test suite (in its own package) also called cargotest.
|
||||
# NB: don't exclude rust-installer, it's needed for "install" functionality
|
||||
src/tools/cargo
|
||||
src/tools/clippy
|
||||
src/tools/rls
|
||||
src/tools/remote-test-client
|
||||
src/tools/remote-test-server
|
||||
src/tools/rust-analyzer
|
||||
src/tools/rustfmt
|
||||
src/tools/miri
|
||||
# Embedded GH pages
|
||||
src/tools/clippy/util/gh-pages
|
||||
# Misc embedded
|
||||
vendor/structopt/link-check-headers.json
|
||||
# Embedded C libraries
|
||||
vendor/libz-sys/src/zlib*
|
||||
vendor/lzma-sys*/xz-*
|
||||
# Embedded binary blobs
|
||||
vendor/winapi-*/*/*.a
|
||||
vendor/mdbook/src/theme/playground_editor
|
||||
# Pre-generated dovcs
|
||||
src/tools/rustfmt/docs
|
||||
# Embedded proprietary doc formats
|
||||
src/doc/book/nostarch/docx
|
||||
# unused dependencies, generated by debian/prune-unused-deps
|
||||
@ -42,25 +46,19 @@ Files-Excluded:
|
||||
vendor/addr2line-0.14.0
|
||||
vendor/adler-0.2.3
|
||||
vendor/always-assert
|
||||
vendor/annotate-snippets-0.6.1
|
||||
vendor/anyhow-1.0.34
|
||||
vendor/anymap
|
||||
vendor/ar
|
||||
vendor/arrayref
|
||||
vendor/array_tool
|
||||
vendor/arrayvec-0.5.1
|
||||
vendor/autocfg-1.0.0
|
||||
vendor/backtrace
|
||||
vendor/base64
|
||||
vendor/bitmaps
|
||||
vendor/blake2b_simd
|
||||
vendor/bytecount
|
||||
vendor/byteorder-1.3.4
|
||||
vendor/byteorder-1.4.2
|
||||
vendor/bytes
|
||||
vendor/bytesize
|
||||
vendor/camino
|
||||
vendor/cargo_metadata-0.12.0
|
||||
vendor/cargo_metadata-0.8.2
|
||||
vendor/cargo_metadata
|
||||
vendor/cargo-platform
|
||||
@ -73,8 +71,6 @@ Files-Excluded:
|
||||
vendor/commoncrypto
|
||||
vendor/commoncrypto-sys
|
||||
vendor/compiletest_rs-0.5.0
|
||||
vendor/compiletest_rs
|
||||
vendor/constant_time_eq
|
||||
vendor/const_fn
|
||||
vendor/core-foundation
|
||||
vendor/core-foundation-sys
|
||||
@ -97,12 +93,7 @@ Files-Excluded:
|
||||
vendor/curl-sys
|
||||
vendor/dashmap
|
||||
vendor/derive_more
|
||||
vendor/derive-new
|
||||
vendor/directories
|
||||
vendor/dirs
|
||||
vendor/dirs-next
|
||||
vendor/dirs-sys
|
||||
vendor/dirs-sys-next
|
||||
vendor/drop_bomb
|
||||
vendor/either-1.6.0
|
||||
vendor/env_logger-0.6.2
|
||||
@ -134,7 +125,6 @@ Files-Excluded:
|
||||
vendor/futures-util
|
||||
vendor/fwdansi
|
||||
vendor/gcc
|
||||
vendor/getrandom
|
||||
vendor/git2
|
||||
vendor/git2-curl
|
||||
vendor/heck-0.3.1
|
||||
@ -144,7 +134,6 @@ Files-Excluded:
|
||||
vendor/humantime
|
||||
vendor/idna-0.1.5
|
||||
vendor/idna-0.2.0
|
||||
vendor/if_chain
|
||||
vendor/im-rc
|
||||
vendor/indexmap-1.6.0
|
||||
vendor/indexmap-1.6.1
|
||||
@ -152,7 +141,6 @@ Files-Excluded:
|
||||
vendor/inotify-sys
|
||||
vendor/instant-0.1.6
|
||||
vendor/iovec
|
||||
vendor/itertools-0.8.2
|
||||
vendor/itertools
|
||||
vendor/itoa-0.4.6
|
||||
vendor/jemallocator
|
||||
@ -205,7 +193,6 @@ Files-Excluded:
|
||||
vendor/openssl-src
|
||||
vendor/openssl-sys
|
||||
vendor/ordslice
|
||||
vendor/packed_simd
|
||||
vendor/parity-tokio-ipc
|
||||
vendor/parking_lot-0.11.0
|
||||
vendor/parking_lot_core-0.8.0
|
||||
@ -222,7 +209,6 @@ Files-Excluded:
|
||||
vendor/proc-macro-hack
|
||||
vendor/proc-macro-nested
|
||||
vendor/pulldown-cmark-to-cmark
|
||||
vendor/quine-mc_cluskey
|
||||
vendor/quote-1.0.7
|
||||
vendor/racer
|
||||
vendor/rand
|
||||
@ -232,47 +218,19 @@ Files-Excluded:
|
||||
vendor/rand_xoshiro
|
||||
vendor/rayon-1.3.1
|
||||
vendor/rayon-core-1.7.1
|
||||
vendor/redox_users-0.3.4
|
||||
vendor/redox_users
|
||||
vendor/regalloc
|
||||
vendor/region
|
||||
vendor/rls-analysis
|
||||
vendor/rls-vfs
|
||||
vendor/rowan
|
||||
vendor/rust-argon2
|
||||
vendor/rustc-ap-rustc_arena
|
||||
vendor/rustc-ap-rustc_ast
|
||||
vendor/rustc-ap-rustc_ast_passes
|
||||
vendor/rustc-ap-rustc_ast_pretty
|
||||
vendor/rustc-ap-rustc_attr
|
||||
vendor/rustc-ap-rustc_data_structures
|
||||
vendor/rustc-ap-rustc_errors
|
||||
vendor/rustc-ap-rustc_expand
|
||||
vendor/rustc-ap-rustc_feature
|
||||
vendor/rustc-ap-rustc_fs_util
|
||||
vendor/rustc-ap-rustc_graphviz
|
||||
vendor/rustc-ap-rustc_index
|
||||
vendor/rustc-ap-rustc_lexer-705.0.0
|
||||
vendor/rustc-ap-rustc_lexer
|
||||
vendor/rustc-ap-rustc_lint_defs
|
||||
vendor/rustc-ap-rustc_macros
|
||||
vendor/rustc-ap-rustc_parse
|
||||
vendor/rustc-ap-rustc_serialize
|
||||
vendor/rustc-ap-rustc_session
|
||||
vendor/rustc-ap-rustc_span
|
||||
vendor/rustc-ap-rustc_target
|
||||
vendor/rustc-semver
|
||||
vendor/rustc_tools_util
|
||||
vendor/rustc_version
|
||||
vendor/rustversion
|
||||
vendor/salsa
|
||||
vendor/salsa-macros
|
||||
vendor/schannel
|
||||
vendor/security-framework
|
||||
vendor/security-framework-sys
|
||||
vendor/semver-0.9.0
|
||||
vendor/semver
|
||||
vendor/semver-parser
|
||||
vendor/serde-1.0.118
|
||||
vendor/serde_derive-1.0.118
|
||||
vendor/serde_ignored
|
||||
@ -289,21 +247,14 @@ Files-Excluded:
|
||||
vendor/snap-1.0.1
|
||||
vendor/socket2-0.3.16
|
||||
vendor/strip-ansi-escapes
|
||||
vendor/structopt
|
||||
vendor/structopt-derive
|
||||
vendor/syn-1.0.38
|
||||
vendor/syn-1.0.60
|
||||
vendor/target-lexicon
|
||||
vendor/term-0.6.1
|
||||
vendor/term
|
||||
vendor/termcolor-1.1.0
|
||||
vendor/tester-0.7.0
|
||||
vendor/tester
|
||||
vendor/text-size
|
||||
vendor/thiserror-1.0.20
|
||||
vendor/thiserror
|
||||
vendor/thiserror-impl-1.0.20
|
||||
vendor/thiserror-impl
|
||||
vendor/thread_local-1.0.1
|
||||
vendor/threadpool
|
||||
vendor/tinyvec-0.3.4
|
||||
@ -312,7 +263,6 @@ Files-Excluded:
|
||||
vendor/tokio-util
|
||||
vendor/tower-service
|
||||
vendor/ungrammar
|
||||
vendor/unicode_categories
|
||||
vendor/unicode-normalization-0.1.13
|
||||
vendor/unicode-segmentation-1.6.0
|
||||
vendor/url-1.7.2
|
||||
@ -1766,6 +1716,210 @@ Copyright: 2020-2020 Charles Lew <crlf0710@gmail.com>
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/unicode-rs/unicode-security
|
||||
|
||||
Files: vendor/blake2b_simd/*
|
||||
Copyright: 2018-2020 Jack O'Connor
|
||||
License: MIT
|
||||
Comment: see https://github.com/oconnor663/blake2_simd
|
||||
|
||||
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/constant_time_eq/*
|
||||
Copyright: 2015-2020 Cesar Eduardo Barros <cesarb@cesarb.eti.br>
|
||||
License: CC0-1.0
|
||||
Comment: see https://github.com/cesarb/constant_time_eq
|
||||
|
||||
Files: vendor/derive-new/*
|
||||
Copyright: 2016-2020 Nick Cameron <ncameron@mozilla.com>
|
||||
License: MIT
|
||||
Comment: see https://github.com/nrc/derive-new
|
||||
|
||||
Files: vendor/dirs/*
|
||||
Copyright: 2015-2020 Simon Ochsenreither <simon@ochsenreither.de>
|
||||
2015-2020 dirs-rs contributors
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/soc/dirs-rs
|
||||
|
||||
Files: vendor/dirs-sys/*
|
||||
Copyright: 2015-2020 Simon Ochsenreither <simon@ochsenreither.de>
|
||||
2015-2020 dirs-rs contributors
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/dirs-dev/dirs-sys-rs
|
||||
|
||||
Files: vendor/if_chain/*
|
||||
Copyright: 2016-2020 Chris Wong <lambda.fairy@gmail.com>
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/lfairy/if_chain
|
||||
|
||||
Files: vendor/measureme-0.7.1/*
|
||||
Copyright: 2019-2020 Wesley Wiser <wwiser@gmail.com>
|
||||
2019-2020 Michael Woerister <michaelwoerister@posteo>
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/measureme
|
||||
|
||||
Files: vendor/quine-mc_cluskey/*
|
||||
Copyright: 2016-2016 Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
|
||||
License: MIT
|
||||
Comment: see https://github.com/oli-obk/quine-mc_cluskey
|
||||
|
||||
Files: vendor/redox_users/*
|
||||
Copyright: 2017-2020 Jose Narvaez <goyox86@gmail.com>
|
||||
2017-2020 Wesley Hershberger <mggmugginsmc@gmail.com>
|
||||
License: MIT
|
||||
Comment: see https://gitlab.redox-os.org/redox-os/users
|
||||
|
||||
Files: vendor/rust-argon2/*
|
||||
Copyright: 2017-2020 Martijn Rijkeboer <mrr@sru-systems.com>
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/sru-systems/rust-argon2
|
||||
|
||||
Files: vendor/term/*
|
||||
Copyright: 2014-2020 The Rust Project Developers
|
||||
2014-2020 Steven Allen
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/Stebalien/term
|
||||
|
||||
Files: vendor/tester/*
|
||||
Copyright: 2016-2019 The Rust Project Developers
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/messense/rustc-test
|
||||
|
||||
Files: vendor/annotate-snippets-0.6.1/*
|
||||
Copyright: 2018-2020 Zibi Braniecki <gandalf@mozilla.com>
|
||||
License: Apache-2.0 or MIT
|
||||
Comment: see https://github.com/rust-lang/annotate-snippets-rs
|
||||
|
||||
Files: vendor/bytecount/*
|
||||
Copyright: 2016-2020 Andre Bogus <bogusandre@gmail.de>
|
||||
2016-2020 Joshua Landau <joshua@landau.ws>
|
||||
License: Apache-2.0 or MIT
|
||||
Comment: see https://github.com/llogiq/bytecount
|
||||
|
||||
Files: vendor/packed_simd/*
|
||||
Copyright: 2018-2020 Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang-nursery/packed_simd
|
||||
|
||||
Files: vendor/rustc-ap-rustc_arena/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_ast/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_ast_passes/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_ast_pretty/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_attr/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_data_structures/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_errors/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_expand/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_feature/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_fs_util/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_graphviz/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_index/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_macros/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_parse/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_serialize/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_session/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_span/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/rustc-ap-rustc_target/*
|
||||
Copyright: 2010-2020 The Rust Project Developers
|
||||
License: MIT or Apache-2.0
|
||||
Comment: see https://github.com/rust-lang/rust
|
||||
|
||||
Files: vendor/structopt/*
|
||||
Copyright: 2017-2020 Guillaume Pinot <texitoi@texitoi.eu>
|
||||
2017-2020 others
|
||||
License: Apache-2.0 OR MIT
|
||||
Comment: see https://github.com/TeXitoi/structopt
|
||||
|
||||
Files: vendor/structopt-derive/*
|
||||
Copyright: 2017-2020 Guillaume Pinot <texitoi@texitoi.eu>
|
||||
License: Apache-2.0 or MIT
|
||||
Comment: see https://github.com/TeXitoi/structopt
|
||||
|
||||
Files: vendor/thiserror/*
|
||||
Copyright: 2019-2020 David Tolnay <dtolnay@gmail.com>
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/dtolnay/thiserror
|
||||
|
||||
Files: vendor/thiserror-impl/*
|
||||
Copyright: 2019-2020 David Tolnay <dtolnay@gmail.com>
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/dtolnay/thiserror
|
||||
|
||||
Files: vendor/unicode_categories/*
|
||||
Copyright: 2015-2016 Sean Gillespie <sean@swgillespie.me>
|
||||
License: MIT OR Apache-2.0
|
||||
Comment: see https://github.com/swgillespie/unicode-categories
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2013-2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
||||
License: MIT or Apache-2.0
|
||||
|
||||
@ -6,15 +6,7 @@ Index: rustc.git/Cargo.toml
|
||||
===================================================================
|
||||
--- rustc.git.orig/Cargo.toml
|
||||
+++ rustc.git/Cargo.toml
|
||||
@@ -6,7 +6,6 @@ members = [
|
||||
"library/test",
|
||||
"src/rustdoc-json-types",
|
||||
"src/tools/cargotest",
|
||||
- "src/tools/clippy",
|
||||
"src/tools/compiletest",
|
||||
"src/tools/error_index_generator",
|
||||
"src/tools/linkchecker",
|
||||
@@ -15,23 +14,11 @@ members = [
|
||||
@@ -16,23 +16,12 @@ members = [
|
||||
"src/tools/tidy",
|
||||
"src/tools/tier-check",
|
||||
"src/tools/build-manifest",
|
||||
@ -28,7 +20,7 @@ Index: rustc.git/Cargo.toml
|
||||
- "src/tools/cargo/crates/credential/cargo-credential-wincred",
|
||||
"src/tools/rustdoc",
|
||||
- "src/tools/rls",
|
||||
- "src/tools/rustfmt",
|
||||
"src/tools/rustfmt",
|
||||
- "src/tools/miri",
|
||||
- "src/tools/miri/cargo-miri",
|
||||
"src/tools/rustdoc-themes",
|
||||
@ -38,7 +30,7 @@ Index: rustc.git/Cargo.toml
|
||||
]
|
||||
|
||||
exclude = [
|
||||
@@ -69,24 +60,8 @@ gimli.debug = 0
|
||||
@@ -81,24 +70,8 @@ gimli.debug = 0
|
||||
miniz_oxide.debug = 0
|
||||
object.debug = 0
|
||||
|
||||
@ -63,12 +55,6 @@ Index: rustc.git/Cargo.toml
|
||||
|
||||
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
|
||||
# here
|
||||
@@ -100,5 +75,3 @@ rustc-std-workspace-std = { path = 'libr
|
||||
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
|
||||
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
|
||||
|
||||
-[patch."https://github.com/rust-lang/rust-clippy"]
|
||||
-clippy_lints = { path = "src/tools/clippy/clippy_lints" }
|
||||
Index: rustc.git/src/bootstrap/bootstrap.py
|
||||
===================================================================
|
||||
--- rustc.git.orig/src/bootstrap/bootstrap.py
|
||||
@ -163,3 +149,83 @@ Index: rustc.git/src/tools/tidy/src/deps.rs
|
||||
];
|
||||
|
||||
for &name in FORBIDDEN_TO_HAVE_DUPLICATES {
|
||||
Index: rustc.git/src/tools/rustfmt/Cargo.toml
|
||||
===================================================================
|
||||
--- rustc.git.orig/src/tools/rustfmt/Cargo.toml
|
||||
+++ rustc.git/src/tools/rustfmt/Cargo.toml
|
||||
@@ -43,10 +43,10 @@ regex = "1.0"
|
||||
term = "0.6"
|
||||
diff = "0.1"
|
||||
log = "0.4"
|
||||
-env_logger = "0.6"
|
||||
+env_logger = "0.7"
|
||||
getopts = "0.2"
|
||||
derive-new = "0.5"
|
||||
-cargo_metadata = "0.8"
|
||||
+cargo_metadata = "0.11"
|
||||
bytecount = "0.6"
|
||||
unicode-width = "0.1.5"
|
||||
unicode_categories = "0.1.1"
|
||||
@@ -59,11 +59,6 @@ lazy_static = "1.0.0"
|
||||
anyhow = "1.0"
|
||||
thiserror = "1.0"
|
||||
|
||||
-# A noop dependency that changes in the Rust repository, it's a bit of a hack.
|
||||
-# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
|
||||
-# for more information.
|
||||
-rustc-workspace-hack = "1.0.0"
|
||||
-
|
||||
[dependencies.rustc_ast]
|
||||
package = "rustc-ap-rustc_ast"
|
||||
version = "705.0.0"
|
||||
Index: rustc.git/src/tools/rustfmt/src/cargo-fmt/main.rs
|
||||
===================================================================
|
||||
--- rustc.git.orig/src/tools/rustfmt/src/cargo-fmt/main.rs
|
||||
+++ rustc.git/src/tools/rustfmt/src/cargo-fmt/main.rs
|
||||
@@ -519,7 +519,7 @@ fn get_cargo_metadata(
|
||||
if let Some(manifest_path) = manifest_path {
|
||||
cmd.manifest_path(manifest_path);
|
||||
}
|
||||
- cmd.other_options(&[String::from("--offline")]);
|
||||
+ cmd.other_options(vec![String::from("--offline")]);
|
||||
|
||||
match cmd.exec() {
|
||||
Ok(metadata) => Ok(metadata),
|
||||
Index: rustc.git/src/bootstrap/tool.rs
|
||||
===================================================================
|
||||
--- rustc.git.orig/src/bootstrap/tool.rs
|
||||
+++ rustc.git/src/bootstrap/tool.rs
|
||||
@@ -545,7 +545,16 @@ impl Step for Cargo {
|
||||
|
||||
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
||||
let builder = run.builder;
|
||||
- run.path("src/tools/cargo").default_condition(builder.config.extended)
|
||||
+ run.path("src/tools/cargo").default_condition(
|
||||
+ builder.config.extended
|
||||
+ && builder.config.tools.as_ref().map_or(
|
||||
+ true,
|
||||
+ // If `tools` is set, search list for this tool.
|
||||
+ |tools| {
|
||||
+ tools.iter().any(|tool| tool == "cargo")
|
||||
+ }
|
||||
+ )
|
||||
+ )
|
||||
}
|
||||
|
||||
fn make_run(run: RunConfig<'_>) {
|
||||
Index: rustc.git/src/tools/clippy/Cargo.toml
|
||||
===================================================================
|
||||
--- rustc.git.orig/src/tools/clippy/Cargo.toml
|
||||
+++ rustc.git/src/tools/clippy/Cargo.toml
|
||||
@@ -46,11 +46,6 @@ clippy-mini-macro-test = { version = "0.
|
||||
derive-new = "0.5"
|
||||
regex = "1.4"
|
||||
|
||||
-# A noop dependency that changes in the Rust repository, it's a bit of a hack.
|
||||
-# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
|
||||
-# for more information.
|
||||
-rustc-workspace-hack = "1.0.0"
|
||||
-
|
||||
[build-dependencies]
|
||||
rustc_tools_util = { version = "0.2.0", path = "rustc_tools_util" }
|
||||
|
||||
|
||||
29
debian/patches/d-0005-clippy-feature-sync.patch
vendored
Normal file
29
debian/patches/d-0005-clippy-feature-sync.patch
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
enable features needed by rustfmt to make build system happy and speedup build.
|
||||
this is what rustc_workspace_hack does in the upstream build.
|
||||
|
||||
diff --git a/src/tools/clippy/clippy_lints/Cargo.toml b/src/tools/clippy/clippy_lints/Cargo.toml
|
||||
index e959c1a6511..39308996342 100644
|
||||
--- a/src/tools/clippy/clippy_lints/Cargo.toml
|
||||
+++ b/src/tools/clippy/clippy_lints/Cargo.toml
|
||||
@@ -25,7 +25,7 @@ pulldown-cmark = { version = "0.8", default-features = false }
|
||||
quine-mc_cluskey = "0.2.2"
|
||||
regex-syntax = "0.6"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
-smallvec = { version = "1", features = ["union"] }
|
||||
+smallvec = { version = "1", features = ["may_dangle", "union"] }
|
||||
toml = "0.5.3"
|
||||
unicode-normalization = "0.1"
|
||||
semver = "0.11"
|
||||
diff --git a/src/tools/rustfmt/Cargo.toml b/src/tools/rustfmt/Cargo.toml
|
||||
index 0f5bec2dcca..c9a64f05949 100644
|
||||
--- a/src/tools/rustfmt/Cargo.toml
|
||||
+++ b/src/tools/rustfmt/Cargo.toml
|
||||
@@ -37,7 +37,7 @@ generic-simd = ["bytecount/generic-simd"]
|
||||
itertools = "0.8"
|
||||
toml = "0.5"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
-serde_json = "1.0"
|
||||
+serde_json = { version = "1.0", features = ["unbounded_depth"] }
|
||||
unicode-segmentation = "1.0.0"
|
||||
regex = "1.0"
|
||||
term = "0.6"
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -24,6 +24,7 @@ d-0002-pkg-config-no-special-snowflake.patch
|
||||
d-0003-mdbook-strip-embedded-libs.patch
|
||||
# Other patches needed by the full Debian build
|
||||
d-0004-cc-psm-rebuild-wasm32.patch
|
||||
d-0005-clippy-feature-sync.patch
|
||||
#d-use-system-compiler-rt.patch
|
||||
d-cargo-doc-paths.patch
|
||||
d-custom-debuginfo-path.patch
|
||||
|
||||
2
debian/rust-clippy.install
vendored
Normal file
2
debian/rust-clippy.install
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
usr/bin/clippy-driver
|
||||
usr/bin/cargo-clippy
|
||||
2
debian/rustfmt.install
vendored
Normal file
2
debian/rustfmt.install
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
usr/bin/rustfmt
|
||||
usr/bin/cargo-fmt
|
||||
10
debian/upstream-tarball-unsuspicious.txt
vendored
10
debian/upstream-tarball-unsuspicious.txt
vendored
@ -38,6 +38,7 @@ src/doc/unstable-book/src/*/*.md
|
||||
src/etc/third-party/README.txt
|
||||
src/librustc_codegen_ssa/README.md
|
||||
src/librustdoc/html/highlight/fixtures/sample.html
|
||||
src/tools/rustfmt/*.md
|
||||
vendor/*/.travis.yml
|
||||
vendor/*/Cargo.toml
|
||||
vendor/*/CHANGELOG.md
|
||||
@ -122,6 +123,7 @@ library/stdarch/crates/core_arch/foo.wasm
|
||||
src/doc/rustc-dev-guide/src/queries/example-0.counts.txt
|
||||
src/test/run-make-fulldeps/target-specs/*.json
|
||||
src/test/run-make-fulldeps/libtest-json/output.json
|
||||
src/tools/clippy/.remarkrc
|
||||
vendor/clap/.mention-bot
|
||||
vendor/cloudabi/cloudabi.rs
|
||||
vendor/elasticlunr-rs/src/lang/*.rs
|
||||
@ -209,6 +211,11 @@ src/test/rustdoc-json/*.expected
|
||||
src/test/ui/macros/not-utf8.bin
|
||||
src/test/ui/terminal-width/non-whitespace-trimming*.rs
|
||||
src/tools/*/tests/*/*.stderr
|
||||
src/tools/clippy/tests/ui-toml/*/*.stderr
|
||||
src/tools/clippy/tests/ui/wildcard_enum_match_arm.fixed
|
||||
src/tools/rustfmt/tests/writemode/target/*.json
|
||||
src/tools/rustfmt/tests/writemode/target/*.xml
|
||||
src/tools/rustfmt/tests/source/*.rs
|
||||
vendor/bstr/src/unicode/data/*Test.txt
|
||||
vendor/cargo_metadata*/tests/test_samples.rs
|
||||
vendor/cssparser/src/css-parsing-tests/*.json
|
||||
@ -259,7 +266,7 @@ vendor/sha2/tests/data/*.blb
|
||||
vendor/sha2/tests/data/*.bin
|
||||
vendor/snap/data/*
|
||||
vendor/tar/tests/archives/*.tar
|
||||
vendor/term-0*/tests/data/*
|
||||
vendor/term/tests/data/*
|
||||
vendor/toml/tests/*/*.toml
|
||||
vendor/toml/tests/*/*.json
|
||||
vendor/unicode-segmentation/src/testdata.rs
|
||||
@ -269,6 +276,7 @@ vendor/xml5ever/data/bench/strong.xml
|
||||
vendor/yaml-rust/tests/specexamples.rs.inc
|
||||
vendor/yaml-rust-0*/tests/specexamples.rs.inc
|
||||
|
||||
|
||||
# Compromise, ideally we'd autogenerate these
|
||||
# Should already by documented in debian/copyright
|
||||
src/doc/rustc-dev-guide/src/mir/mir_*.svg
|
||||
|
||||
Loading…
Reference in New Issue
Block a user