diff options
| author | bors <bors@rust-lang.org> | 2021-06-07 00:01:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-07 00:01:10 +0000 |
| commit | 69e2f23a41f3bb5cb49e3dc66160f3888d871917 (patch) | |
| tree | 66314bbf9882c29571d0cb590d532e28f47f3be3 /compiler/rustc_error_codes/src | |
| parent | 35fff69d043b1c0f5c29894e7f4b0da8b039c131 (diff) | |
| parent | 487200b4380b478a5052ab5bc14a63d03bd89b92 (diff) | |
| download | rust-69e2f23a41f3bb5cb49e3dc66160f3888d871917.tar.gz rust-69e2f23a41f3bb5cb49e3dc66160f3888d871917.zip | |
Auto merge of #86080 - GuillaumeGomez:rollup-vb5g14e, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #83433 (Pass --cfg=bootstrap for proc macros built by stage0) - #84940 (Don't run sanity checks for `x.py setup`) - #85912 (Use `Iterator::any` and `filter_map` instead of open-coding them) - #85965 (Remove dead code from `LocalAnalyzer`) - #86010 (Fix two ICEs in the parser) - #86040 (Fix display for search results) - #86058 (Remove `_` from E0121 diagnostic suggestions) - #86077 (Fix corrected example in E0759.md) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0759.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0759.md b/compiler/rustc_error_codes/src/error_codes/E0759.md index 2fe5ada257f..6b16a7d415a 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0759.md +++ b/compiler/rustc_error_codes/src/error_codes/E0759.md @@ -16,13 +16,13 @@ fn bar(x: &i32) -> Box<dyn Debug> { // error! Add `'static` requirement to fix them: -```compile_fail,E0759 +``` # use std::fmt::Debug; -fn foo(x: &i32) -> impl Debug + 'static { // ok! +fn foo(x: &'static i32) -> impl Debug + 'static { // ok! x } -fn bar(x: &i32) -> Box<dyn Debug + 'static> { // ok! +fn bar(x: &'static i32) -> Box<dyn Debug + 'static> { // ok! Box::new(x) } ``` |