Skip to content

Commit 523be2e

Browse files
committed
Auto merge of #93138 - matthiaskrgr:rollup-m8akifd, r=matthiaskrgr
Rollup of 17 pull requests Successful merges: - #91032 (Introduce drop range tracking to generator interior analysis) - #92856 (Exclude "test" from doc_auto_cfg) - #92860 (Fix errors on blanket impls by ignoring the children of generated impls) - #93038 (Fix star handling in block doc comments) - #93061 (Only suggest adding `!` to expressions that can be macro invocation) - #93067 (rustdoc mobile: fix scroll offset when jumping to internal id) - #93086 (Add tests to ensure that `let_chains` works with `if_let_guard`) - #93087 (Fix src/test/run-make/raw-dylib-alt-calling-convention) - #93091 (⬆ chalk to 0.76.0) - #93094 (src/test/rustdoc-json: Check for `struct_field`s in `variant_tuple_struct.rs`) - #93098 (Show a more informative panic message when `DefPathHash` does not exist) - #93099 (rustdoc: auto create output directory when "--output-format json") - #93102 (Pretty printer algorithm revamp step 3) - #93104 (Support --bless for pp-exact pretty printer tests) - #93114 (update comment for `ensure_monomorphic_enough`) - #93128 (Add script to prevent point releases with same number as existing ones) - #93136 (Backport the 1.58.1 release notes to master) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 777bb86 + dd16431 commit 523be2e

Some content is hidden

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

62 files changed

+1902
-316
lines changed

.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ jobs:
128128
- name: ensure backported commits are in upstream branches
129129
run: src/ci/scripts/verify-backported-commits.sh
130130
if: success() && !env.SKIP_JOB
131+
- name: ensure the stable version number is correct
132+
run: src/ci/scripts/verify-stable-version-number.sh
133+
if: success() && !env.SKIP_JOB
131134
- name: run the build
132135
run: src/ci/scripts/run-build-from-ci.sh
133136
env:
@@ -502,6 +505,9 @@ jobs:
502505
- name: ensure backported commits are in upstream branches
503506
run: src/ci/scripts/verify-backported-commits.sh
504507
if: success() && !env.SKIP_JOB
508+
- name: ensure the stable version number is correct
509+
run: src/ci/scripts/verify-stable-version-number.sh
510+
if: success() && !env.SKIP_JOB
505511
- name: run the build
506512
run: src/ci/scripts/run-build-from-ci.sh
507513
env:
@@ -612,6 +618,9 @@ jobs:
612618
- name: ensure backported commits are in upstream branches
613619
run: src/ci/scripts/verify-backported-commits.sh
614620
if: success() && !env.SKIP_JOB
621+
- name: ensure the stable version number is correct
622+
run: src/ci/scripts/verify-stable-version-number.sh
623+
if: success() && !env.SKIP_JOB
615624
- name: run the build
616625
run: src/ci/scripts/run-build-from-ci.sh
617626
env:

Cargo.lock

+11-8
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
544544

545545
[[package]]
546546
name = "chalk-derive"
547-
version = "0.75.0"
547+
version = "0.76.0"
548548
source = "registry+https://github.com/rust-lang/crates.io-index"
549-
checksum = "d54e3b5f9e3425e6b119ff07568d8d006bfa5a8d6f78a9cbc3530b1e962e316c"
549+
checksum = "58c24b8052ea1e3adbb6f9ab7ba5fcc18b9d12591c042de4c833f709ce81e0e0"
550550
dependencies = [
551551
"proc-macro2",
552552
"quote",
@@ -556,9 +556,9 @@ dependencies = [
556556

557557
[[package]]
558558
name = "chalk-engine"
559-
version = "0.75.0"
559+
version = "0.76.0"
560560
source = "registry+https://github.com/rust-lang/crates.io-index"
561-
checksum = "bdc891073396b167163db77123b0a3c00088edc00466cecc5531f33e3e989523"
561+
checksum = "0eca186b6ea9af798312f4b568fd094c82e7946ac08be5dc5fea22decc6d2ed8"
562562
dependencies = [
563563
"chalk-derive",
564564
"chalk-ir",
@@ -569,9 +569,9 @@ dependencies = [
569569

570570
[[package]]
571571
name = "chalk-ir"
572-
version = "0.75.0"
572+
version = "0.76.0"
573573
source = "registry+https://github.com/rust-lang/crates.io-index"
574-
checksum = "2b79e5a1d04b79311e90c69356a2c62027853906a7e33b3e070b93c055fc3e8a"
574+
checksum = "f3cad5c3f1edd4b4a2c9bda24ae558ceb4f88336f88f944c2e35d0bfeb13c818"
575575
dependencies = [
576576
"bitflags",
577577
"chalk-derive",
@@ -580,13 +580,14 @@ dependencies = [
580580

581581
[[package]]
582582
name = "chalk-solve"
583-
version = "0.75.0"
583+
version = "0.76.0"
584584
source = "registry+https://github.com/rust-lang/crates.io-index"
585-
checksum = "a5d2a1db6605aba70a58820bd80ac422b218913a510f1a40beef9efc5371ea1d"
585+
checksum = "94533188d3452bc72cbd5618d166f45fc7646b674ad3fe9667d557bc25236dee"
586586
dependencies = [
587587
"chalk-derive",
588588
"chalk-ir",
589589
"ena",
590+
"indexmap",
590591
"itertools 0.10.1",
591592
"petgraph",
592593
"rustc-hash",
@@ -4413,13 +4414,15 @@ dependencies = [
44134414
"rustc_attr",
44144415
"rustc_data_structures",
44154416
"rustc_errors",
4417+
"rustc_graphviz",
44164418
"rustc_hir",
44174419
"rustc_hir_pretty",
44184420
"rustc_index",
44194421
"rustc_infer",
44204422
"rustc_lint",
44214423
"rustc_macros",
44224424
"rustc_middle",
4425+
"rustc_serialize",
44234426
"rustc_session",
44244427
"rustc_span",
44254428
"rustc_target",

RELEASES.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Version 1.58.1 (2022-01-19)
2+
===========================
3+
4+
* Fix race condition in `std::fs::remove_dir_all` ([CVE-2022-21658])
5+
* [Handle captured arguments in the `useless_format` Clippy lint][clippy/8295]
6+
* [Move `non_send_fields_in_send_ty` Clippy lint to nursery][clippy/8075]
7+
* [Fix wrong error message displayed when some imports are missing][91254]
8+
* [Fix rustfmt not formatting generated files from stdin][92912]
9+
10+
[CVE-2022-21658]: https://www.cve.org/CVERecord?id=CVE-2022-21658]
11+
[91254]: https://github.com/rust-lang/rust/pull/91254
12+
[92912]: https://github.com/rust-lang/rust/pull/92912
13+
[clippy/8075]: https://github.com/rust-lang/rust-clippy/pull/8075
14+
[clippy/8295]: https://github.com/rust-lang/rust-clippy/pull/8295
15+
116
Version 1.58.0 (2022-01-13)
217
==========================
318

0 commit comments

Comments
 (0)