Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eb909d8

Browse files
committedFeb 23, 2023
Auto merge of rust-lang#108386 - matthiaskrgr:rollup-nojivk9, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#108063 (Ban associated type bounds in bad positions) - rust-lang#108208 (Correctly handle aggregates in DataflowConstProp) - rust-lang#108218 (Windows: Quote more batch file arguments) - rust-lang#108349 (rustdoc: Prevent duplicated imports) - rust-lang#108350 (Use associated type bounds in some places in the compiler) - rust-lang#108358 (Add git config command to `.git-blame-ignore-revs`) - rust-lang#108373 (hir-analysis: make where-clause-on-main diagnostic translatable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8b1dbf7 + 60014e4 commit eb909d8

File tree

61 files changed

+455
-351
lines changed

Some content is hidden

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

61 files changed

+455
-351
lines changed
 

‎.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Use `git config blame.ignorerevsfile .git-blame-ignore-revs` to make `git blame` ignore the following commits.
2+
13
# format the world
24
a06baa56b95674fc626b3c3fd680d6a65357fe60
35
# format libcore

‎compiler/rustc_ast_lowering/locales/en-US.ftl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ ast_lowering_remove_parentheses = remove these parentheses
1919
ast_lowering_misplaced_impl_trait =
2020
`impl Trait` only allowed in function and inherent method return types, not in {$position}
2121
22+
ast_lowering_misplaced_assoc_ty_binding =
23+
associated type bounds are only allowed in where clauses and function signatures, not in {$position}
24+
2225
ast_lowering_rustc_box_attribute_error =
2326
#[rustc_box] requires precisely one argument and no other attributes are allowed
2427

0 commit comments

Comments
 (0)
Please sign in to comment.