diff options
| author | bors <bors@rust-lang.org> | 2020-04-10 13:05:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-10 13:05:05 +0000 |
| commit | dbc3cfdd25ccd56edf3ea364f86ab32967636c26 (patch) | |
| tree | a75c01452eed404a4610f586ab4efd89938b6107 /src/librustc_error_codes/error_codes | |
| parent | 167510f776891f2b0b18d1168ed42377a63493a7 (diff) | |
| parent | 68e0e6ba848087734be581afe5478635a647aa7c (diff) | |
| download | rust-dbc3cfdd25ccd56edf3ea364f86ab32967636c26.tar.gz rust-dbc3cfdd25ccd56edf3ea364f86ab32967636c26.zip | |
Auto merge of #70983 - Centril:rollup-npabk7c, r=Centril
Rollup of 8 pull requests Successful merges: - #70784 (Consider methods on fundamental `impl` when method is not found on numeric type) - #70843 (Remove the Ord bound that was plaguing drain_filter) - #70913 (Replace "rc"/"arc" lang items with Rc/Arc diagnostic items.) - #70932 (De-abuse TyKind::Error in pattern type checking) - #70952 (Clean up E0511 explanation) - #70964 (rustc_session CLI lint parsing: mark a temporary hack as such) - #70969 (Fix JSON file_name documentation for macros.) - #70975 (Fix internal doc comment nits.) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0152.md | 4 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0511.md | 5 | ||||
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0718.md | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/librustc_error_codes/error_codes/E0152.md b/src/librustc_error_codes/error_codes/E0152.md index 602dcb6e2c5..120c96b4211 100644 --- a/src/librustc_error_codes/error_codes/E0152.md +++ b/src/librustc_error_codes/error_codes/E0152.md @@ -5,8 +5,8 @@ Erroneous code example: ```compile_fail,E0152 #![feature(lang_items)] -#[lang = "arc"] -struct Foo; // error: duplicate lang item found: `arc` +#[lang = "owned_box"] +struct Foo; // error: duplicate lang item found: `owned_box` ``` Lang items are already implemented in the standard library. Unless you are diff --git a/src/librustc_error_codes/error_codes/E0511.md b/src/librustc_error_codes/error_codes/E0511.md index 4f6644f3582..5351a685eb5 100644 --- a/src/librustc_error_codes/error_codes/E0511.md +++ b/src/librustc_error_codes/error_codes/E0511.md @@ -1,5 +1,6 @@ -Invalid monomorphization of an intrinsic function was used. Erroneous code -example: +Invalid monomorphization of an intrinsic function was used. + +Erroneous code example: ```compile_fail,E0511 #![feature(platform_intrinsics)] diff --git a/src/librustc_error_codes/error_codes/E0718.md b/src/librustc_error_codes/error_codes/E0718.md index 8548ff0c150..e7ae51ca588 100644 --- a/src/librustc_error_codes/error_codes/E0718.md +++ b/src/librustc_error_codes/error_codes/E0718.md @@ -6,6 +6,6 @@ Examples of erroneous code: ```compile_fail,E0718 #![feature(lang_items)] -#[lang = "arc"] +#[lang = "owned_box"] static X: u32 = 42; ``` |