Skip to content

Commit af77e1e

Browse files
Merge #468
468: Rename resolution's PathExpression to UnqualifiedPathExpression r=pietroalbini a=Veykril Fixes #454 Co-authored-by: Lukas Wirth <[email protected]>
2 parents ff496a6 + f6347f5 commit af77e1e

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

src/entities-and-resolution.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Paths
257257
QualifyingTrait ::=
258258
$$as$$ TypePath
259259

260-
PathExpression ::=
260+
UnqualifiedPathExpression ::=
261261
$$::$$? PathExpressionSegment ($$::$$ PathExpressionSegment)*
262262

263263
PathExpressionSegment ::=
@@ -346,8 +346,8 @@ A :t:`single segment path` is a :t:`path` consisting of exactly one
346346
A :t:`multi segment path` is a :t:`path` consisting of more than one
347347
:t:`path segment`.
348348

349-
:dp:`fls_1hi5xjym7152`
350-
A :t:`path expression` is a :t:`path` that acts as an :t:`expression`.
349+
:dp:`fls_nRgjCLYZL3iX`
350+
An :t:`unqualified path expression` is a :t:`path expression` without a :t:`qualified type`.
351351

352352
:dp:`fls_tvvycup09b51`
353353
A :t:`path expression` is subject to :t:`path expression resolution`.
@@ -410,7 +410,7 @@ declaration of ``crate_visible_function``.
410410
crate::outer_module::inner_module::crate_visible_function();
411411
412412
:dp:`fls_no853u27p4f3`
413-
The following is a path expression with a generic argument.
413+
The following is an :t:`unqualified path expression`` with a generic argument.
414414

415415
.. code-block:: rust
416416
@@ -1676,14 +1676,14 @@ Path Expression Resolution
16761676

16771677
:dp:`fls_akjlqm3a2lb1`
16781678
:t:`Path expression resolution` is a form of :t:`path resolution` that applies
1679-
to a :t:`path expression`.
1679+
to a :t:`unqualified path expression`.
16801680

16811681
:dp:`fls_xyzdajtf4u2t`
16821682
The :t:`namespace context` of :t:`path expression resolution` is the
16831683
:t:`value namespace`.
16841684

16851685
:dp:`fls_d45vu3iazi3`
1686-
The leftmost :t:`path segment` of a :t:`path expression` is resolved using
1686+
The leftmost :t:`path segment` of a :t:`unqualified path expression` is resolved using
16871687
general :t:`path resolution`. The remaining :t:`[path segment]s` are resolved
16881688
in left-to-right order, as follows:
16891689

src/expressions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ Path Expressions
611611
.. syntax::
612612

613613
PathExpression ::=
614-
PathExpression
614+
UnqualifiedPathExpression
615615
| QualifiedPathExpression
616616
617617
.. rubric:: Legality Rules

src/glossary.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7280,6 +7280,14 @@ unnamed lifetime
72807280
An :dt:`unnamed lifetime` is a :t:`lifetime` declared with character 0x5F (low
72817281
line).
72827282

7283+
.. _fls_cDVmvrVhUBmr:
7284+
7285+
unqualified path expression
7286+
^^^^^^^^^^^^^^^^^^^^^^^^^^^
7287+
7288+
:dp:`fls_9xKgP8uVsOaR`
7289+
An :dt:`unqualified path expression` is a :t:`path expression` without a :t:`qualified type`.
7290+
72837291
.. _fls_6349nvapfj9d:
72847292

72857293
unsafe block

0 commit comments

Comments
 (0)