Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename resolution's PathExpression to UnqualifiedPathExpression #468

Merged
merged 1 commit into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/entities-and-resolution.rst
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ Paths
QualifyingTrait ::=
$$as$$ TypePath

PathExpression ::=
UnqualifiedPathExpression ::=
$$::$$? PathExpressionSegment ($$::$$ PathExpressionSegment)*

PathExpressionSegment ::=
Expand Down Expand Up @@ -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`.
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion src/expressions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ Path Expressions
.. syntax::

PathExpression ::=
PathExpression
UnqualifiedPathExpression
| QualifiedPathExpression

.. rubric:: Legality Rules
Expand Down
9 changes: 8 additions & 1 deletion src/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7289,6 +7289,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
Expand Down Expand Up @@ -7652,4 +7660,3 @@ zero-variant enum type
:dp:`fls_84gqz3vwi5mj`
A :dt:`zero-variant enum type` is an :t:`enum type` without any
:t:`[enum variant]s`.