Skip to content

Commit

Permalink
Fix up remaining unresolved links
Browse files Browse the repository at this point in the history
  • Loading branch information
Veykril committed Aug 14, 2023
1 parent 48c783f commit 542a56e
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 12 deletions.
12 changes: 6 additions & 6 deletions src/entities-and-resolution.rst
Original file line number Diff line number Diff line change
Expand Up @@ -944,8 +944,8 @@ The :dt:`core prelude` is a :t:`prelude` that brings :t:`in scope` of every
An :dt:`external prelude` is a :t:`prelude` that brings :t:`in scope` of the
:t:`crate root module` the :t:`entities <entity>` of the :t:`[crate]s` imported
using external :t:`[crate import]s` or supplied by a tool. If the external
:t:`crate import` uses a :t:`renaming`, then the :t:`identifier of the
`:t:`renaming` is instead added to the :t:`external prelude`. The core
:t:`crate import` uses a :t:`renaming`, then the :t:`identifier` of the
:t:`renaming` is instead added to the :t:`external prelude`. The core
:t:`crate` is always added to the :t:`external prelude` unless the :t:`crate
root` is subject to :t:`attribute` ``no_core``.

Expand Down Expand Up @@ -1124,8 +1124,8 @@ keyword ``self`` shall be subject to the following:

:dp:`fls_wB3fVglLOqbZ`
It is a static error if two :t:`[glob import]s` import the same :t:`name` in the
same :t:`namespace` but refer to different :t:`entities` if the :t:`name` is
used or :t:`shadowed <shadowing>`.
same :t:`namespace` but refer to different :t:`entities <entity>` if the
:t:`name` is used or :t:`shadowed <shadowing>`.

:dp:`fls_zmYSBW995kSN`
If two :t:`[glob import]s` import the same :t:`entity` under the same :t:`name`,
Expand Down Expand Up @@ -1474,8 +1474,8 @@ operand` of the:t:`call expression` :t:`under resolution`. From then on, the
:t:`candidate callee type chain`

#. :dp:`fls_TWR5GIUxPcaJ`
If the :t:`candidate call type` is a :t:`callee type`, then the :t:`callee
type` of the :t:`call expression` is that :t:`candidate call type` and
If the :t:`candidate callee type` is a :t:`callee type`, then the :t:`callee
type` of the :t:`call expression` is that :t:`candidate callee type` and
:t:`call resolution` stops.

.. _fls_i6qzga6dyaee:
Expand Down
14 changes: 9 additions & 5 deletions src/expressions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ involve :t:`[type]s` that require :t:`destruction`:

* :dp:`fls_e0a1e8ddph7`
:t:`[Type cast expression]s` that are not :t:`[pointer-to-address cast]s`,
:t:`[function-pointer-to-address cast]s`, and :t:`[unsized cast]s` that
:t:`[function-pointer-to-address cast]s`, and :t:`[unsized coercion]s` that
involve a :t:`trait object type`,

* :dp:`fls_zcuzhw7qkzkr`
Expand Down Expand Up @@ -2053,12 +2053,16 @@ A :t:`type cast expression` with the following characteristics performs a
* :dp:`fls_133j6xw8k4qe`
An :t:`operand` of a :t:`function pointer type` and a :t:`target type`
``*const V`` or ``*mut V`` where ``V`` implements the
:std:`core::marker::Sized` :t:`trait` perform function-pointer-to-pointer
cast.
:std:`core::marker::Sized` :t:`trait` perform
:dt:`function-pointer-to-pointer cast`.

* :dp:`fls_bhw2j9wjpf2x`
An :t:`operand` of a :t:`function pointer type` and a target :t:`integer type`
perform function-pointer-to-address cast.
perform :t:`function-pointer-to-address` cast. A
:dt:`function-pointer-to-address cast` produces an integer that represents the
machine address of the referenced :t:`function`. If the :t:`integer type` is
smaller than the size of the :t:`function pointer type`, the address is
truncated.

:dp:`fls_3ww5gbk9w4ys`
A :t:`cast` is legal when it either performs :t:`type coercion` or is a
Expand Down Expand Up @@ -4924,7 +4928,7 @@ the :t:`capturing expression` and it is defined outside of the
:t:`Capture mode` is the mechanism by which a :t:`capture target` is captured.

:dp:`fls_O6WYL8AUyPje`
A :t:`captured` :t:`capture target` with :t:`capture mode` :dt:`by copy capture`
A :t:`captured` :t:`capture target` with :t:`capture mode` :dt:`by value capture`
:t:`passes <passing convention>` the :t:`value` of the :t:`capture target` into
the :t:`capturing environment`.

Expand Down
10 changes: 10 additions & 0 deletions src/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,16 @@ A :dt:`call operand` is the :t:`function` being invoked or the
:dp:`fls_w6wu4wi6srjj`
See :s:`CallOperand`.

.. _fls_zSh4enFjxeaN:

call resolution
^^^^^^^^^^^^^^^

:dp:`fls_fS1ZjGGypvbn`
:dt:`Call resolution` is a kind of :t:`resolution` that applies to a
:t:`call expression`.


.. _fls_AK8mL1LeftO0:

call site hygiene
Expand Down
6 changes: 5 additions & 1 deletion src/types-and-traits.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@ and always a power of two. A :t:`value` of :t:`alignment` ``N`` is stored at an
address that is a multiple of ``N``.

:dp:`fls_1pbwigq6f3ha`
The :t:`size` of a :t:`value` is the offset in bytes between successive elements
The :t:`size` of a :t:`type` is the offset in bytes between successive elements
in :t:`array type` ``[T, N]`` where ``T`` is the :t:`type` of the :t:`value`,
including any padding for :t:`alignment`. :t:`Size` is a multiple of the
:t:`alignment`.
Expand Down Expand Up @@ -1416,6 +1416,10 @@ For a :t:`closure type`, the :t:`layout` is tool-defined.
For a :t:`thin pointer`, the :t:`size` and :t:`alignment` are those of :t:`type`
:c:`usize`.

:dp:`fls_nrqG8i3fmpm4`
For a :t:`function pointer type`, the :t:`size` and :t:`alignment` are those of
a :c:`thin pointer`.

:dp:`fls_e5hivr6m5s3h`
For a :t:`fat pointer`, the :t:`size` and :t:`alignment` are tool-defined, but
are at least those of a :t:`thin pointer`.
Expand Down

0 comments on commit 542a56e

Please sign in to comment.