Specify #127921 changes

Author: Veykril

src/changelog.rst

@@ -48,7 +48,7 @@ Language changes in Rust 1.82.0
 
   * Changed syntax: :s:`ImplTraitTypeSpecification`, :s:`ImplTraitTypeSpecificationOneBound`
 
-  * New syntax: :s:`UseCaptures`, :s:`UseCapturesGenericArgs`, , :s:`UseCapturesGenericArg`
+  * New syntax: :s:`UseCaptures`, :s:`UseCapturesGenericArgs`, :s:`UseCapturesGenericArg`
 
   * New paragraphs: :p:`fls_69hqMjvNno9u`, :p:`fls_OnyR0Wsfk7KI`, :p:`fls_KgH6c5cC4S0G`, :p:`fls_iT9WCNfUZQnC`
 
@@ -60,6 +60,16 @@ Language changes in Rust 1.82.0
 
 * `Stabilize unsafe extern blocks (RFC 3484) <https://github.com/rust-lang/rust/pull/127921>`_
 
+  * New syntax: :s:`ItemSafety`
+
+  * Changed syntax: :s:`WeakKeyword`, :s:`FunctionQualifierList`, :s:`StaticDeclaration`
+
+  * New paragraphs: :p:`fls_8ltVLtAfvy0m`, :p:`fls_WRpcVF1fLEpr`, :p:`fls_8ltVLtAfvy0m`
+
+  * Changed paragraphs: :p:`fls_g0JEluWqBpNc`, :p:`fls_7ucwmzqtittv`, :p:`fls_4dje9t5y2dia`, :p:`fls_l88r9fj82650`, :p:`fls_fo9with6xumo`
+
+  * Removed paragraph :p:`fls_iaimuqcclstl`
+
 * `Stabilize nested field access in \`offset_of!\` <https://github.com/rust-lang/rust/pull/128284>`_
 
   * No change: `offset_of` is a library defined macro

src/ffi.rst

@@ -160,7 +160,10 @@ External Blocks
 
 :dp:`fls_4dje9t5y2dia`
 An :t:`external block` is a :t:`construct` that provides the declarations of
-foreign :t:`[function]s` as unchecked imports.
+:t:`[external function]s` and :t:`[external static]s` as unchecked imports.
+
+:dp:`fls_8ltVLtAfvy0m`
+An :t:`unsafe external block` is an :t:`external block` subject to keyword ``unsafe``.
 
 :dp:`fls_Nz0l16hMxqTd`
 The :t:`ABI` of an :t:`external block` is determined as follows:
@@ -171,10 +174,6 @@ The :t:`ABI` of an :t:`external block` is determined as follows:
 * :dp:`fls_PBsepNHImJKH`
   Otherwise the :t:`ABI` is the :t:`extern C ABI`.
 
-:dp:`fls_iaimuqcclstl`
-The ``unsafe`` :t:`keyword` of an :t:`external block` is rejected, but may
-still be consumed by :t:`[macro]s`.
-
 .. rubric:: Examples
 
 .. code-block:: rust
@@ -201,7 +200,7 @@ External Functions
 An :t:`external function` is an unchecked import of a foreign :t:`function`.
 
 :dp:`fls_l88r9fj82650`
-An :t:`external function` shall be invoked from an :t:`unsafe context`.
+An :t:`external function` shall be invoked from an :t:`unsafe context` unless it is defined in an :t:`unsafe external block` and subject to :s:`ItemSafety` with keyword ``safe``.
 
 :dp:`fls_qwchgvvnp0qe`
 An :t:`external function` shall not specify a :s:`FunctionQualifierList`.
@@ -240,7 +239,7 @@ An :t:`external static` inherits the :t:`ABI` of its enclosing
 :t:`external block`.
 
 :dp:`fls_fo9with6xumo`
-An :t:`external static` shall be referenced from an :t:`unsafe context`.
+An :t:`external static` shall be referenced from an :t:`unsafe context` unless it is defined in an :t:`unsafe external block` and subject to :s:`ItemSafety` with keyword ``safe``.
 
 :dp:`fls_tr7purzcldn0`
 An :t:`external static` shall not specify a :t:`static initializer`.

src/functions.rst

@@ -16,7 +16,7 @@ Functions
        FunctionQualifierList $$fn$$ Name GenericParameterList? $$($$ FunctionParameterList? $$)$$ ReturnType? WhereClause? (FunctionBody | ;)
 
    FunctionQualifierList ::=
-       $$const$$? $$async$$? $$unsafe$$? AbiSpecification?
+       $$const$$? $$async$$? ItemSafety? AbiSpecification?
 
    FunctionParameterList ::=
        (FunctionParameter ($$,$$ FunctionParameter)* $$,$$?)
@@ -171,7 +171,10 @@ is equivalent to :t:`function`
    }
 
 :dp:`fls_7ucwmzqtittv`
-An :t:`unsafe function` is a :t:`function` subject to :t:`keyword` ``unsafe``.
+An :t:`unsafe function` is a :t:`function` subject to an :s:`ItemSafety` with :t:`keyword` ``unsafe``.
+
+:dp:`fls_8ltVLtAfvy0m`
+A :t:`function` shall only be subject to an :s:`ItemSafety` with :t:`keyword` ``safe`` if it is an :t:`external function` in an :t:`unsafe external block`.
 
 :dp:`fls_5hn8fkf7rcvz`
 The invocation of an :t:`unsafe function` shall require :t:`unsafe context`.

src/items.rst

@@ -36,6 +36,10 @@ Items
        MacroRulesDeclaration
      | TerminatedMacroInvocation
 
+   ItemSafety ::=
+       $$unsafe$$
+     | $$safe$$
+
 .. rubric:: Legality Rules
 
 :dp:`fls_s3b1cba9lfj5`

src/lexical-elements.rst

@@ -1535,6 +1535,7 @@ Weak Keywords
        $$macro_rules$$
      | $$'static$$
      | $$union$$
+     | $$safe$$
 
 .. rubric:: Legality Rules
 
@@ -1554,3 +1555,6 @@ Word ``'static`` acts as a :t:`keyword` only when used in the context of a
 Word ``union`` acts as a :t:`keyword` only when used in the context of a
 :s:`UnionDeclaration`.
 
+:dp:`fls_g0JEluWqBpNc`
+Word ``safe`` acts as a :t:`keyword` only when used as a qualifier of :s:`Function` or :s:`Static` in the context of a :s:`ExternalBlock`.
+

src/values.rst

@@ -140,7 +140,7 @@ Statics
 .. syntax::
 
    StaticDeclaration ::=
-       $$static$$ $$mut$$? Name TypeAscription StaticInitializer? $$;$$
+       ItemSafety? $$static$$ $$mut$$? Name TypeAscription StaticInitializer? $$;$$
 
    StaticInitializer ::=
        $$=$$ Expression
@@ -163,6 +163,9 @@ The :t:`type specification` of a :t:`static` shall have ``'static``
 The :t:`type` of a :t:`static` shall implement the :std:`core::marker::Sized`
 :t:`trait`.
 
+:dp:`fls_WRpcVF1fLEpr`
+A :t:`static` shall only be subject to an :s:`ItemSafety` if it is an :t:`external static` in an :t:`unsafe external block`.
+
 :dp:`fls_doi4z6u55bi7`
 A :t:`mutable static` is a :t:`static` with :t:`keyword` ``mut`` whose
 :t:`value` can be modified.