diff options
| author | bors <bors@rust-lang.org> | 2020-05-14 12:28:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-14 12:28:23 +0000 |
| commit | af6d8865fe0e1f6338c32cb3370802f2ebca0dc4 (patch) | |
| tree | 2fd89879edd8b151150a11ebfca69825885616d6 /src/librustc_error_codes/error_codes | |
| parent | 7c34d8d6629506a596215886e5fc4bb2b04b00ae (diff) | |
| parent | 56986bebc23788146dc46606d5af39b6354d6ad3 (diff) | |
| download | rust-af6d8865fe0e1f6338c32cb3370802f2ebca0dc4.tar.gz rust-af6d8865fe0e1f6338c32cb3370802f2ebca0dc4.zip | |
Auto merge of #72187 - RalfJung:rollup-a7a9jdi, r=RalfJung
Rollup of 12 pull requests Successful merges: - #71525 (`prefix` should not be mutable.) - #71741 (Pointer printing: do not print 0 offset) - #71870 (Be slightly more precise about any::type_name()'s guarantees.) - #71909 (Document From trait for Option implementations) - #71964 (Fix bootstrap failing on win32) - #72137 (Clean up E0581 explanation) - #72138 (Add doc comment for `rustc_middle::mir::mono::Linkage`) - #72150 (Remove UnnormalizedProjection) - #72151 (Update books) - #72163 (docs: remove comment referencing non-existent method) - #72169 (Clean up E0582 explanation) - #72183 (Fix Arc::decr_strong_count doc test) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0581.md | 9 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0582.md | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/librustc_error_codes/error_codes/E0581.md b/src/librustc_error_codes/error_codes/E0581.md index 947ec255a9d..89f6e3269ec 100644 --- a/src/librustc_error_codes/error_codes/E0581.md +++ b/src/librustc_error_codes/error_codes/E0581.md @@ -1,4 +1,4 @@ -In a `fn` type, a lifetime appears only in the return type, +In a `fn` type, a lifetime appears only in the return type and not in the arguments types. Erroneous code example: @@ -10,8 +10,11 @@ fn main() { } ``` -To fix this issue, either use the lifetime in the arguments, or use -`'static`. Example: +The problem here is that the lifetime isn't contrained by any of the arguments, +making it impossible to determine how long it's supposed to live. + +To fix this issue, either use the lifetime in the arguments, or use the +`'static` lifetime. Example: ``` fn main() { diff --git a/src/librustc_error_codes/error_codes/E0582.md b/src/librustc_error_codes/error_codes/E0582.md index c0cf44852c4..e50cc60ea33 100644 --- a/src/librustc_error_codes/error_codes/E0582.md +++ b/src/librustc_error_codes/error_codes/E0582.md @@ -1,5 +1,5 @@ -A lifetime appears only in an associated-type binding, -and not in the input types to the trait. +A lifetime is only present in an associated-type binding, and not in the input +types to the trait. Erroneous code example: |