diff options
| author | bors <bors@rust-lang.org> | 2020-07-09 21:32:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-09 21:32:02 +0000 |
| commit | e59b08e62ea691916d2f063cac5aab4634128022 (patch) | |
| tree | 7bafe998869c457ebaa9f82179f49c37baf7a551 /src/librustc_error_codes/error_codes | |
| parent | 5db778affee7c6600c8e7a177c48282dab3f6292 (diff) | |
| parent | 9353e21bfdea148e910b2530270a3418db836bf3 (diff) | |
Auto merge of #74195 - Manishearth:rollup-h3m0sl8, r=Manishearth
Rollup of 14 pull requests Successful merges: - #73292 (Fixing broken link for the Eq trait) - #73791 (Allow for parentheses after macro intra-doc-links) - #74070 ( Use for<'tcx> fn pointers in Providers, instead of having Providers<'tcx>.) - #74077 (Use relative path for local links to primitives) - #74079 (Eliminate confusing "globals" terminology.) - #74107 (Hide `&mut self` methods from Deref in sidebar if there are no `DerefMut` impl for the type.) - #74136 (Fix broken link in rustdocdoc) - #74137 (Update cargo) - #74142 (Liballoc use vec instead of vector) - #74143 (Try remove unneeded ToString import in liballoc slice) - #74146 (update miri) - #74150 (Avoid "blacklist") - #74184 (Add docs for intra-doc-links) - #74188 (Tweak `::` -> `:` typo heuristic and reduce verbosity) Failed merges: - #74122 (Start-up clean-up) - #74127 (Avoid "whitelist") r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0570.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes/E0570.md b/src/librustc_error_codes/error_codes/E0570.md index bf9615f8738..355e71ffb43 100644 --- a/src/librustc_error_codes/error_codes/E0570.md +++ b/src/librustc_error_codes/error_codes/E0570.md @@ -1,6 +1,6 @@ The requested ABI is unsupported by the current target. -The rust compiler maintains for each target a blacklist of ABIs unsupported on +The rust compiler maintains for each target a list of unsupported ABIs on that target. If an ABI is present in such a list this usually means that the target / ABI combination is currently unsupported by llvm. |