Merge #468

468: Rename resolution's PathExpression to UnqualifiedPathExpression r=pietroalbini a=Veykril Fixes #454 Co-authored-by: Lukas Wirth <[email protected]>
ferrocene · Nov 16, 2023 · af77e1e · af77e1e
2 parents ff496a6 + f6347f5
commit af77e1e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/entities-and-resolution.rst b/src/entities-and-resolution.rst
@@ -257,7 +257,7 @@ Paths
    QualifyingTrait ::=
        $$as$$ TypePath
 
-   PathExpression ::=
+   UnqualifiedPathExpression ::=
        $$::$$? PathExpressionSegment ($$::$$ PathExpressionSegment)*
 
    PathExpressionSegment ::=
@@ -346,8 +346,8 @@ A :t:`single segment path` is a :t:`path` consisting of exactly one
 A :t:`multi segment path` is a :t:`path` consisting of more than one
 :t:`path segment`.
 
-:dp:`fls_1hi5xjym7152`
-A :t:`path expression` is a :t:`path` that acts as an :t:`expression`.
+:dp:`fls_nRgjCLYZL3iX`
+An :t:`unqualified path expression` is a :t:`path expression`  without a :t:`qualified type`.
 
 :dp:`fls_tvvycup09b51`
 A :t:`path expression` is subject to :t:`path expression resolution`.
@@ -410,7 +410,7 @@ declaration of ``crate_visible_function``.
    crate::outer_module::inner_module::crate_visible_function();
 
 :dp:`fls_no853u27p4f3`
-The following is a path expression with a generic argument.
+The following is an :t:`unqualified path expression`` with a generic argument.
 
 .. code-block:: rust
 
@@ -1676,14 +1676,14 @@ Path Expression Resolution
 
 :dp:`fls_akjlqm3a2lb1`
 :t:`Path expression resolution` is a form of :t:`path resolution` that applies
-to a :t:`path expression`.
+to a :t:`unqualified path expression`.
 
 :dp:`fls_xyzdajtf4u2t`
 The :t:`namespace context` of :t:`path expression resolution` is the
 :t:`value namespace`.
 
 :dp:`fls_d45vu3iazi3`
-The leftmost :t:`path segment` of a :t:`path expression` is resolved using
+The leftmost :t:`path segment` of a :t:`unqualified path expression` is resolved using
 general :t:`path resolution`. The remaining :t:`[path segment]s` are resolved
 in left-to-right order, as follows:
 

diff --git a/src/expressions.rst b/src/expressions.rst
@@ -611,7 +611,7 @@ Path Expressions
 .. syntax::
 
    PathExpression ::=
-       PathExpression
+       UnqualifiedPathExpression
      | QualifiedPathExpression
 
 .. rubric:: Legality Rules

diff --git a/src/glossary.rst b/src/glossary.rst
@@ -7280,6 +7280,14 @@ unnamed lifetime
 An :dt:`unnamed lifetime` is a :t:`lifetime` declared with character 0x5F (low
 line).
 
+.. _fls_cDVmvrVhUBmr:
+
+unqualified path expression
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:dp:`fls_9xKgP8uVsOaR`
+An :dt:`unqualified path expression` is a :t:`path expression`  without a :t:`qualified type`.
+
 .. _fls_6349nvapfj9d:
 
 unsafe block