Skip to content

Commit

Permalink
Auto merge of rust-lang#91665 - matthiaskrgr:rollup-o3wnkam, r=matthi…
Browse files Browse the repository at this point in the history
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#90709 (Only shown relevant type params in E0283 label)
 - rust-lang#91551 (Allow for failure of subst_normalize_erasing_regions in const_eval)
 - rust-lang#91570 (Evaluate inline const pat early and report error if too generic)
 - rust-lang#91571 (Remove unneeded access to pretty printer's `s` field in favor of deref)
 - rust-lang#91610 (Link to rustdoc_json_types docs instead of rustdoc-json RFC)
 - rust-lang#91619 (Update cargo)
 - rust-lang#91630 (Add missing whitespace before disabled HTML attribute)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Dec 8, 2021
2 parents f9e77f2 + 382426b commit e6b883c
Show file tree
Hide file tree
Showing 23 changed files with 766 additions and 408 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,11 @@ dependencies = [

[[package]]
name = "clap"
version = "2.33.3"
version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"ansi_term 0.11.0",
"ansi_term 0.12.1",
"atty",
"bitflags",
"strsim",
Expand Down
Loading

0 comments on commit e6b883c

Please sign in to comment.