Commit e6b883c
committed
Auto merge of rust-lang#91665 - matthiaskrgr:rollup-o3wnkam, r=matthiaskrgr
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: rollupFile tree
23 files changed
+766
-408
lines changed- compiler
- rustc_ast_pretty/src/pprust
- rustc_const_eval/src/interpret
- rustc_hir_pretty/src
- rustc_infer/src/infer/error_reporting
- rustc_middle/src/ty
- rustc_mir_build/src/thir/pattern
- src
- doc/rustdoc/src
- librustdoc/html/templates
- test/ui
- const-generics
- defaults
- issues
- consts/const-eval
- inference
- inline-const
- tools
23 files changed
+766
-408
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
558 | 558 | | |
559 | 559 | | |
560 | 560 | | |
561 | | - | |
| 561 | + | |
562 | 562 | | |
563 | | - | |
| 563 | + | |
564 | 564 | | |
565 | | - | |
| 565 | + | |
566 | 566 | | |
567 | 567 | | |
568 | 568 | | |
| |||
0 commit comments