diff options
| author | bors <bors@rust-lang.org> | 2020-03-15 10:52:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-15 10:52:37 +0000 |
| commit | 5a72ecf2c5c97933cecce91cb58d104da8120624 (patch) | |
| tree | 5d63fe83cbdf0ea858d2ef9942a384e5d7089cfd /src/librustc_error_codes/error_codes | |
| parent | 7cdbc87a49b0b705a41a004a6d486b0952521ae7 (diff) | |
| parent | 838884e022ff571108d166f4637281eafabad3e1 (diff) | |
| download | rust-5a72ecf2c5c97933cecce91cb58d104da8120624.tar.gz rust-5a72ecf2c5c97933cecce91cb58d104da8120624.zip | |
Auto merge of #70016 - Dylan-DPC:rollup-5k7lxs3, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #69357 (Emit 1-based column numbers in debuginfo) - #69471 (Remove `sip::Hasher::short_write`.) - #69498 (Change "method" to "associated function") - #69967 (Remove a few `Rc`s from RegionInferenceCtxt) - #69987 (Add self to .mailmap) - #69991 (fix E0117 message out of sync) - #69993 (Add long error explanation for E0693) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0117.md | 2 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0693.md | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes/E0117.md b/src/librustc_error_codes/error_codes/E0117.md index 7fa211d4a27..0544667ccca 100644 --- a/src/librustc_error_codes/error_codes/E0117.md +++ b/src/librustc_error_codes/error_codes/E0117.md @@ -1,4 +1,4 @@ -The `Drop` trait was implemented on a non-struct type. +Only traits defined in the current crate can be implemented for arbitrary types. Erroneous code example: diff --git a/src/librustc_error_codes/error_codes/E0693.md b/src/librustc_error_codes/error_codes/E0693.md new file mode 100644 index 00000000000..43e9d17979e --- /dev/null +++ b/src/librustc_error_codes/error_codes/E0693.md @@ -0,0 +1,19 @@ +`align` representation hint was incorrectly declared. + +Erroneous code examples: + +```compile_fail,E0693 +#[repr(align=8)] // error! +struct Align8(i8); + +#[repr(align="8")] // error! +struct Align8(i8); +``` + +This is a syntax error at the level of attribute declarations. The proper +syntax for `align` representation hint is the following: + +``` +#[repr(align(8))] // ok! +struct Align8(i8); +``` |