Auto merge of #30145 - petrochenkov:hyg, r=nrc

[rust.git] / src / doc / reference.md

diff --git a/src/doc/reference.md b/src/doc/reference.md
index 2ce21b47dfb1359af18fac3a7da0ddde774c0779..98074f09441c4b0e3a220f14dcdeeca803f21be4 100644 (file)
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -677,8 +677,8 @@ apply to the crate as a whole.
 ```
 
 A crate that contains a `main` function can be compiled to an executable. If a
-`main` function is present, its return type must be [`unit`](#tuple-types)
-and it must take no arguments.
+`main` function is present, its return type must be `()`
+("[unit](#tuple-types)") and it must take no arguments.
 
 # Items and attributes
 
@@ -2325,10 +2325,6 @@ The currently implemented features of the reference compiler are:
 * `simd_ffi` - Allows use of SIMD vectors in signatures for foreign functions.
                The SIMD interface is subject to change.
 
-* `staged_api` - Allows usage of stability markers and `#![staged_api]` in a
-                 crate. Stability markers are also attributes: `#[stable]`,
-                 `#[unstable]`, and `#[rustc_deprecated]` are the three levels.
-
 * `start` - Allows use of the `#[start]` attribute, which changes the entry point
             into a Rust program. This capability, especially the signature for the
             annotated function, is subject to change.
@@ -2372,6 +2368,9 @@ The currently implemented features of the reference compiler are:
                                         influence type inference.
 * - `braced_empty_structs` - Allows use of empty structs and enum variants with braces.
 
+* - `stmt_expr_attributes` - Allows attributes on expressions and
+                             non-item statements.
+
 If a feature is promoted to a language feature, then all existing programs will
 start to receive compilation warnings about `#![feature]` directives which enabled
 the new feature (because the directive is no longer necessary). However, if a