ensure main text has all glossary entries (part 3)

Also, replace duplicated terms regarding to lifetimes

Author: tshepang

src/changelog.rst

@@ -57,6 +57,10 @@ FLS maintenance
   - :p:`fls_9d970yfwmj2d`
   - :p:`fls_p9687v3xckps`
   - :p:`fls_8j408kckzzud`
+  - :p:`fls_mdejdc0nNgyO`
+  - :p:`fls_WUCvCauUCmsD`
+  - :p:`fls_5SVthCNZBcVS`
+  - :p:`fls_SonodAQVL5J4`
 
 Language changes in Rust 1.94.0
 -------------------------------

src/generics.rst

@@ -463,7 +463,7 @@ of the :t:`type parameter`.
   Any remaining :t:`[generic parameter]s` without corresponding conformant
   :t:`[generic argument]s` are :t:`[constant parameter]s` with
   :t:`[constant parameter initializer]s`, :t:`[lifetime parameter]s` with
-  either inferred :t:`[lifetime argument]s` or :t:`[elided lifetime]s`,
+  either inferred :t:`[lifetime argument]s` or :t:`elided lifetimes <lifetime elision>`,
   :t:`[type parameter]s` with :t:`[type parameter initializer]s` or inferred
   :t:`[type argument]s`, and
 

src/glossary.rst

@@ -1242,18 +1242,6 @@ a :t:`slice type`.
 
 See :s:`ElementType`.
 
-elided
-^^^^^^
-
-For :dt:`elided`, see :t:`elided lifetime`.
-
-elided lifetime
-^^^^^^^^^^^^^^^
-
-An :dt:`elided lifetime` is either an :t:`unnamed lifetime` or a :t:`lifetime`
-that has been explicitly omitted from a :t:`function signature` or an
-:t:`implementation`.
-
 else expression
 ^^^^^^^^^^^^^^^
 
@@ -4745,12 +4733,6 @@ unnamed constant
 An :dt:`unnamed constant` is a :t:`constant` declared with character 0x5F (low
 line).
 
-unnamed lifetime
-^^^^^^^^^^^^^^^^
-
-An :dt:`unnamed lifetime` is a :t:`lifetime` declared with character 0x5F (low
-line).
-
 unqualified path expression
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

src/lexical-elements.rst

@@ -1332,6 +1332,12 @@ A :t:`block comment` is a :t:`comment` that spans one or more :t:`[line]s`.
 :dp:`fls_nayisy85kyq2`
 A :t:`line comment` is a :t:`comment` that spans exactly one :t:`line`.
 
+:dp:`fls_5SVthCNZBcVS`
+A :dt:`syntactic category` is a nonterminal in the Backus-Naur Form grammar definition of the Rust programming language.
+
+:dp:`fls_SonodAQVL5J4`
+A :dt:`construct` is a piece of program text that is an instance of a :t:`syntactic category`.
+
 :dp:`fls_k3hj30hjkdhw`
 An :t:`inner block doc` is a :t:`block comment` that applies to an enclosing
 :t:`non-[comment]` :t:`construct`.
@@ -1560,4 +1566,3 @@ Word ``union`` acts as a :t:`keyword` only when used in the context of a
 
 :dp:`fls_g0JEluWqBpNc`
 Word ``safe`` acts as a :t:`keyword` only when used as a qualifier of :s:`FunctionDeclaration` or :s:`StaticDeclaration` in the context of a :s:`ExternalBlock`.
-

src/types-and-traits.rst

@@ -767,6 +767,12 @@ Struct Types
 A :t:`struct type` is an :t:`abstract data type` that is a product of other
 :t:`[type]s`.
 
+:dp:`fls_mdejdc0nNgyO`
+A :dt:`record struct type` is the :t:`type` of a :t:`record struct`.
+
+:dp:`fls_WUCvCauUCmsD`
+A :dt:`record struct field` is a :t:`field` of a :t:`record struct type`.
+
 :dp:`fls_r885av95eivp`
 The :t:`name` of a :t:`record struct field` shall be unique within the
 related :s:`RecordStructDeclaration`.
@@ -3314,17 +3320,17 @@ An :dt:`output lifetime` is one of the following :t:`[lifetime]s`:
 :t:`Lifetime elision` proceeds as follows:
 
 #. :dp:`fls_1j204m1wy333`
-   Each :t:`elided` :t:`input lifetime` is a distinct :t:`lifetime parameter` in
+   Each :t:`elided <lifetime elision>` :t:`input lifetime` is a distinct :t:`lifetime parameter` in
    its related :t:`construct`.
 
 #. :dp:`fls_6km3cbchuxr2`
    If a :t:`construct` has exactly one :t:`input lifetime`, then that
-   :t:`lifetime` is assigned to all :t:`elided` :t:`[output lifetime]s`.
+   :t:`lifetime` is assigned to all :t:`elided <lifetime elision>` :t:`[output lifetime]s`.
 
 #. :dp:`fls_crb6m6b3cdwh`
    If a :t:`function` has a :t:`self parameter` with exactly 1
    :t:`self input lifetime`, then the :t:`lifetime` of the
-   :t:`self input lifetime` is assigned to all :t:`elided`
+   :t:`self input lifetime` is assigned to all :t:`elided <lifetime elision>`
    :t:`[output lifetime]s`.
 
 #. :dp:`fls_ac9tdlfwp5et`
@@ -3340,7 +3346,7 @@ Given :t:`function` ``f`` of the form
    fn f <'a, 'b, T: ToCStr>(&'a mut self, args: &'b [T]) -> &'a mut Command;
 
 :dp:`fls_vcmmkp9uruhr`
-its :t:`lifetime` :t:`elided` form is
+its :t:`lifetime` :t:`elided <lifetime elision>` form is
 
 .. code-block:: rust
 
@@ -3358,16 +3364,16 @@ Static Lifetime Elision
 the :t:`type ascription` of :t:`[constant]s` and :t:`[static]s`.
 
 :dp:`fls_8irr97rZWfSC`
-An :t:`elided` :t:`lifetime` of a :t:`reference type` or :t:`path` in the
+An :t:`elided <lifetime elision>` :t:`lifetime` of a :t:`reference type` or :t:`path` in the
 :t:`type specification` of a :t:`constant` or :t:`static` is inferred to be the
 ``'static'`` lifetime.
 
 :dp:`fls_37udexenqv3p`
 The :t:`lifetime` of an :t:`associated implementation constant` shall not be
-:t:`elided`.
+:t:`elided <lifetime elision>`.
 
 :dp:`fls_xi86he5vvill`
-The :t:`lifetime` of an :t:`associated trait constant` shall not be :t:`elided`.
+The :t:`lifetime` of an :t:`associated trait constant` shall not be :t:`elided <lifetime elision>`.
 
 .. rubric:: Examples
 
@@ -3379,7 +3385,7 @@ Given :t:`static` ``S`` of the form
    static S: &'static [&'static usize] = &[];
 
 :dp:`fls_f3yZ31dRuTPG`
-its :t:`lifetime` :t:`elided` form is
+its :t:`lifetime` :t:`elided <lifetime elision>` form is
 
 .. code-block:: rust
 
@@ -3397,20 +3403,20 @@ Trait Object Lifetime Elision
 applies to :t:`[trait object type]s`.
 
 :dp:`fls_URl9CeIVsiWs`
-An :t:`elided` :t:`lifetime` of a :t:`trait object type` is inferred as follows:
+An :t:`elided <lifetime elision>` :t:`lifetime` of a :t:`trait object type` is inferred as follows:
 
 * :dp:`fls_SHhw6lYHeYyQ`
   If the :t:`trait object type` is used as the :t:`type specification` of a
   :t:`reference type`, then the :t:`lifetime` of the :t:`reference type` is the
-  :t:`elided` :t:`lifetime`,
+  :t:`elided <lifetime elision>` :t:`lifetime`,
 
 * :dp:`fls_lC2rwdPLRwaf`
   If the :t:`trait object type` is used as a :t:`generic argument` and
 
   * :dp:`fls_e36Hh4oJvfhv`
     if the corresponding :t:`generic parameter` has exactly one
     :t:`lifetime bound`, then the :t:`lifetime` of that :t:`bound` is the
-    :t:`elided` :t:`lifetime`,
+    :t:`elided <lifetime elision>` :t:`lifetime`,
 
   * :dp:`fls_ptejalcnIQtm`
     Otherwise it is a static error to infer the :t:`lifetime` :t:`bound`.
@@ -3422,8 +3428,8 @@ An :t:`elided` :t:`lifetime` of a :t:`trait object type` is inferred as follows:
 
 * :dp:`fls_JhmQpUoExiNZ`
   If the :t:`trait` of the :t:`trait object type` has no :t:`[lifetime bound]s`
-  specified, then the :t:`elided` :t:`lifetime` is the ``'static``
-  :t:`lifetime` unless it is :t:`elided` in :t:`[expression]s` where it is
+  specified, then the :t:`elided <lifetime elision>` :t:`lifetime` is the ``'static``
+  :t:`lifetime` unless it is :t:`elided <lifetime elision>` in :t:`[expression]s` where it is
   instead inferred,
 
 * :dp:`fls_cglZigwAnASl`
@@ -3439,7 +3445,7 @@ Given :t:`type alias` ``T`` of the form
    type T<'a> = &'a dyn Trait;
 
 :dp:`fls_YPesUZqYHVUX`
-its :t:`lifetime` :t:`elided` form is
+its :t:`lifetime` :t:`elided <lifetime elision>` form is
 
 .. code-block:: rust
 
@@ -3481,7 +3487,7 @@ Given an :t:`implementation` of the form
     impl Trait<&u8, Strukt<'_>> for &i32 {}
 
 :dp:`fls_w0vwdmO8qV9j`
-its :t:`lifetime` :t:`elided` form is
+its :t:`lifetime` :t:`elided <lifetime elision>` form is
 
 .. code-block:: rust