Skip to content

Commit e782d79

Browse files
committed
Auto merge of #59522 - Centril:rollup, r=Centril
Rollup of 9 pull requests Successful merges: - #59366 (Update books) - #59436 (Update jemalloc-sys to version 0.3.0) - #59454 (Update rustfmt to 1.2.0) - #59462 (Fix error in Rust 2018 + no_core environment) - #59467 (Better diagnostic for binary operation on BoxedValues) - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans) - #59480 (Update stdsimd) - #59486 (Visit `ImplItem` in `dead_code` lint) - #59510 (Rename `type_parameters` to `generics` and so on) Failed merges: - #59516 (Update cargo) r? @ghost
2 parents 2002b4b + 99e886d commit e782d79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+435
-166
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12031203

12041204
[[package]]
12051205
name = "jemalloc-sys"
1206-
version = "0.1.8"
1206+
version = "0.3.0"
12071207
source = "registry+https://github.com/rust-lang/crates.io-index"
12081208
dependencies = [
12091209
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2074,7 +2074,7 @@ name = "rand_chacha"
20742074
version = "0.1.0"
20752075
source = "registry+https://github.com/rust-lang/crates.io-index"
20762076
dependencies = [
2077-
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
2077+
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
20782078
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
20792079
]
20802080

@@ -2096,7 +2096,7 @@ name = "rand_hc"
20962096
version = "0.1.0"
20972097
source = "registry+https://github.com/rust-lang/crates.io-index"
20982098
dependencies = [
2099-
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
2099+
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
21002100
]
21012101

21022102
[[package]]
@@ -2121,7 +2121,7 @@ name = "rand_xorshift"
21212121
version = "0.1.0"
21222122
source = "registry+https://github.com/rust-lang/crates.io-index"
21232123
dependencies = [
2124-
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
2124+
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
21252125
]
21262126

21272127
[[package]]
@@ -2260,7 +2260,7 @@ dependencies = [
22602260
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
22612261
"rustc-workspace-hack 1.0.0",
22622262
"rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
2263-
"rustfmt-nightly 1.1.0",
2263+
"rustfmt-nightly 1.2.0",
22642264
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
22652265
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
22662266
"serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2500,7 +2500,7 @@ dependencies = [
25002500
name = "rustc-main"
25012501
version = "0.0.0"
25022502
dependencies = [
2503-
"jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2503+
"jemalloc-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
25042504
"rustc_codegen_ssa 0.0.0",
25052505
"rustc_driver 0.0.0",
25062506
"rustc_target 0.0.0",
@@ -3056,7 +3056,7 @@ dependencies = [
30563056

30573057
[[package]]
30583058
name = "rustfmt-nightly"
3059-
version = "1.1.0"
3059+
version = "1.2.0"
30603060
dependencies = [
30613061
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
30623062
"bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4096,7 +4096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40964096
"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
40974097
"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
40984098
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
4099-
"checksum jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "bfc62c8e50e381768ce8ee0428ee53741929f7ebd73e4d83f669bcf7693e00ae"
4099+
"checksum jemalloc-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bef0d4ce37578dfd80b466e3d8324bd9de788e249f1accebb0c472ea4b52bdc"
41004100
"checksum jobserver 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "dd80e58f77e0cdea53ba96acc5e04479e5ffc5d869626a6beafe50fed867eace"
41014101
"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
41024102
"checksum jsonrpc-core 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a5152c3fda235dfd68341b3edf4121bc4428642c93acbd6de88c26bf95fc5d7"

src/bootstrap/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ impl<'a> Builder<'a> {
402402
test::UnstableBook,
403403
test::RustcBook,
404404
test::EmbeddedBook,
405+
test::EditionGuide,
405406
test::Rustfmt,
406407
test::Miri,
407408
test::Clippy,

src/bootstrap/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,7 @@ test_book!(
14251425
EmbeddedBook, "src/doc/embedded-book", "embedded-book", default=false;
14261426
TheBook, "src/doc/book", "book", default=false;
14271427
UnstableBook, "src/doc/unstable-book", "unstable-book", default=true;
1428+
EditionGuide, "src/doc/edition-guide", "edition-guide", default=false;
14281429
);
14291430

14301431
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]

src/ci/docker/x86_64-gnu-tools/checktools.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ python2.7 "$X_PY" test --no-fail-fast \
2424
src/doc/reference \
2525
src/doc/rust-by-example \
2626
src/doc/embedded-book \
27+
src/doc/edition-guide \
2728
src/tools/clippy \
2829
src/tools/rls \
2930
src/tools/rustfmt \
@@ -73,6 +74,7 @@ status_check() {
7374
check_dispatch $1 beta nomicon src/doc/nomicon
7475
check_dispatch $1 beta reference src/doc/reference
7576
check_dispatch $1 beta rust-by-example src/doc/rust-by-example
77+
check_dispatch $1 beta edition-guide src/doc/edition-guide
7678
check_dispatch $1 beta rls src/tools/rls
7779
check_dispatch $1 beta rustfmt src/tools/rustfmt
7880
check_dispatch $1 beta clippy-driver src/tools/clippy

src/doc/edition-guide

src/doc/reference

src/doc/unstable-book/src/language-features/plugin.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The advantages over a simple `fn(&str) -> u32` are:
130130
a way to define new literal syntax for any data type.
131131

132132
In addition to procedural macros, you can define new
133-
[`derive`](../reference/attributes.html#derive)-like attributes and other kinds
133+
[`derive`](../reference/attributes/derive.html)-like attributes and other kinds
134134
of extensions. See `Registry::register_syntax_extension` and the
135135
`SyntaxExtension` enum. For a more involved macro example, see
136136
[`regex_macros`](https://github.com/rust-lang/regex/blob/master/regex_macros/src/lib.rs).
@@ -174,7 +174,7 @@ quasiquote as an ordinary plugin library.
174174
# Lint plugins
175175

176176
Plugins can extend [Rust's lint
177-
infrastructure](../reference/attributes.html#lint-check-attributes) with
177+
infrastructure](../reference/attributes/diagnostics.html#lint-check-attributes) with
178178
additional checks for code style, safety, etc. Now let's write a plugin
179179
[`lint_plugin_test.rs`](https://github.com/rust-lang/rust/blob/master/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs)
180180
that warns about any item named `lintme`.
@@ -253,7 +253,7 @@ mostly use the same infrastructure as lint plugins, and provide examples of how
253253
to access type information.
254254

255255
Lints defined by plugins are controlled by the usual [attributes and compiler
256-
flags](../reference/attributes.html#lint-check-attributes), e.g.
256+
flags](../reference/attributes/diagnostics.html#lint-check-attributes), e.g.
257257
`#[allow(test_lint)]` or `-A test-lint`. These identifiers are derived from the
258258
first argument to `declare_lint!`, with appropriate case and punctuation
259259
conversion.

0 commit comments

Comments
 (0)