Skip to content

Commit e6b883c

Browse files
committed
Auto merge of #91665 - matthiaskrgr:rollup-o3wnkam, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90709 (Only shown relevant type params in E0283 label) - #91551 (Allow for failure of subst_normalize_erasing_regions in const_eval) - #91570 (Evaluate inline const pat early and report error if too generic) - #91571 (Remove unneeded access to pretty printer's `s` field in favor of deref) - #91610 (Link to rustdoc_json_types docs instead of rustdoc-json RFC) - #91619 (Update cargo) - #91630 (Add missing whitespace before disabled HTML attribute) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents f9e77f2 + 382426b commit e6b883c

File tree

23 files changed

+766
-408
lines changed

23 files changed

+766
-408
lines changed

Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -558,11 +558,11 @@ dependencies = [
558558

559559
[[package]]
560560
name = "clap"
561-
version = "2.33.3"
561+
version = "2.34.0"
562562
source = "registry+https://github.com/rust-lang/crates.io-index"
563-
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
563+
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
564564
dependencies = [
565-
"ansi_term 0.11.0",
565+
"ansi_term 0.12.1",
566566
"atty",
567567
"bitflags",
568568
"strsim",

0 commit comments

Comments
 (0)