Skip to content

Commit ed46021

Browse files
authored
Merge pull request #2834 from rust-lang/rustc-pull
Rustc pull update
2 parents 4f90925 + 8bd47db commit ed46021

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14196dbfa3eb7c30195251eac092b1b86c8a2d84
1+
17584a181979f04f2aaad867332c22db1caa511a

src/stability.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ The `unstable` attribute infects all sub-items, where the attribute doesn't
2323
have to be reapplied. So if you apply this to a module, all items in the module
2424
will be unstable.
2525

26+
If you rename a feature, you can add `old_name = "old_name"` to produce a
27+
useful error message.
28+
2629
You can make specific sub-items stable by using the `#[stable]` attribute on
2730
them. The stability scheme works similarly to how `pub` works. You can have
2831
public functions of nonpublic modules and you can have stable functions in
@@ -189,4 +192,11 @@ Currently, the items that can be annotated with `#[unstable_feature_bound]` are:
189192
- free function
190193
- trait
191194

195+
## renamed and removed features
196+
Unstable features can get renamed and removed. If you rename a feature, you can add `old_name = "old_name"` to the `#[unstable]` attribute.
197+
If you remove a feature, the `#!unstable_removed(feature = "foo", reason = "brief description", link = "link", since = "1.90.0")`
198+
attribute should be used to produce a good error message for users of the removed feature.
199+
200+
The `link` field can be used to link to the most relevant information on the removal of the feature such as a GitHub issue, comment or PR.
201+
192202
[blog]: https://www.ralfj.de/blog/2018/07/19/const.html

src/tests/compiletest.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,15 @@ However, revisions or building auxiliary via directives are not currently suppor
460460
`rmake.rs` and `run-make-support` may *not* use any nightly/unstable features,
461461
as they must be compilable by a stage 0 rustc that may be a beta or even stable rustc.
462462

463+
By default, run-make tests print each subprocess command and its stdout/stderr.
464+
When running with `--no-capture` on `panic=abort` test suites (such as `cg_clif`),
465+
this can flood the terminal. Omit `--verbose-run-make-subprocess-output` to
466+
suppress this output for passing tests — failing tests always print regardless:
467+
468+
```bash
469+
./x test tests/run-make --no-capture --verbose-run-make-subprocess-output=false
470+
```
471+
463472
#### Quickly check if `rmake.rs` tests can be compiled
464473

465474
You can quickly check if `rmake.rs` tests can be compiled without having to

0 commit comments

Comments
 (0)