diff options
| author | bors <bors@rust-lang.org> | 2023-01-07 06:54:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-07 06:54:47 +0000 |
| commit | 472651aa104dea3e358da78c2548ab035cfaf434 (patch) | |
| tree | 547c9249a5b4d914b5cc27435bb309b85bd7a27b /compiler/rustc_error_codes | |
| parent | 93bf84c9021350608607330175d0513f71f0f967 (diff) | |
| parent | 01cb9dcd5b555c3b66f5a133b5cad5fab5245aec (diff) | |
| download | rust-472651aa104dea3e358da78c2548ab035cfaf434.tar.gz rust-472651aa104dea3e358da78c2548ab035cfaf434.zip | |
Auto merge of #106558 - compiler-errors:rollup-lkii3j3, r=compiler-errors
Rollup of 4 pull requests
Successful merges:
- #106525 (Report WF error for chalk *and* new solver)
- #106533 (Use smaller spans for missing lifetime/generic args)
- #106543 (rustdoc: remove no-op CSS `.rustdoc.source .sidebar { width: 0 }`)
- #106554 (Fix a typo in the explanation of E0588)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0588.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0588.md b/compiler/rustc_error_codes/src/error_codes/E0588.md index 040c7a02ef4..995d945f158 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0588.md +++ b/compiler/rustc_error_codes/src/error_codes/E0588.md @@ -11,7 +11,7 @@ struct Aligned(i32); struct Packed(Aligned); ``` -Just like you cannot have both `align` and `packed` representation hints on a +Just like you cannot have both `align` and `packed` representation hints on the same type, a `packed` type cannot contain another type with the `align` representation hint. However, you can do the opposite: |