diff options
| author | bors <bors@rust-lang.org> | 2021-02-12 14:40:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-12 14:40:27 +0000 |
| commit | d416093209d0dd77a4cdeb5a2f1b5de1316787ec (patch) | |
| tree | 5346fc9e189c71ddfd57402bb3bf9dce8653a1a1 /compiler/rustc_error_codes/src | |
| parent | a118ee2c13cc96ceb27bd5030c1cca1052377604 (diff) | |
| parent | ff8b7f20d9e5e9bb4257f4fc1a41075ad8c5ec1a (diff) | |
| download | rust-d416093209d0dd77a4cdeb5a2f1b5de1316787ec.tar.gz rust-d416093209d0dd77a4cdeb5a2f1b5de1316787ec.zip | |
Auto merge of #82025 - JohnTitor:rollup-cohp0gy, r=JohnTitor
Rollup of 16 pull requests Successful merges: - #79983 (fix indefinite article in cell.rs) - #81831 (Don't display `mut` in arguments for functions documentation) - #81947 (Relax ItemCtxt::to_ty lifetime) - #81954 (RELEASES.md 1.50: Group platform support notes together) - #81955 (bootstrap: Locate llvm-dwp based on llvm-config bindir) - #81959 (Fix assosiated typo) - #81964 (Fix documentation not showing on localStorage error) - #81968 (bootstrap: fix wrong docs installation path) - #81990 (Make suggestion of changing mutability of arguments broader) - #81994 (Improve long explanation for E0542 and E0546) - #81997 (dist: include src/build_helper as part of the crate graph for rustc-dev) - #82003 (Stack probes: fix error message) - #82004 (clean up clean::Static struct) - #82011 (Fix private intra-doc warnings on associated items) - #82013 (Tell user how to fix CI file being not up to date) - #82017 (Fix typo in mod.rs) 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/E0542.md | 2 | ||||
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0546.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0542.md b/compiler/rustc_error_codes/src/error_codes/E0542.md index dbbc34a71be..7cb58f9d0cb 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0542.md +++ b/compiler/rustc_error_codes/src/error_codes/E0542.md @@ -19,7 +19,7 @@ fn _stable_const_fn() {} fn _deprecated_fn() {} ``` -To fix the issue you need to provide the `since` field. +To fix this issue, you need to provide the `since` field. Example: ``` #![feature(staged_api)] diff --git a/compiler/rustc_error_codes/src/error_codes/E0546.md b/compiler/rustc_error_codes/src/error_codes/E0546.md index 0073357b5ea..a33dcb7a9ac 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0546.md +++ b/compiler/rustc_error_codes/src/error_codes/E0546.md @@ -13,7 +13,7 @@ fn unstable_fn() {} fn stable_fn() {} ``` -To fix the issue you need to provide the `feature` field. +To fix this issue, you need to provide the `feature` field. Example: ``` #![feature(staged_api)] |