Skip to content

Commit

Permalink
Merge #508
Browse files Browse the repository at this point in the history
508: fix some typos, links r=tshepang a=nefelitav



Co-authored-by: nefelitav <[email protected]>
  • Loading branch information
bors-ferrocene[bot] and nefelitav authored Jun 20, 2024
2 parents ca28287 + 03f4f03 commit 2f68cc3
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/entities-and-resolution.rst
Original file line number Diff line number Diff line change
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 an :t:`unqualified path expression`` with a generic argument.
The following is an :t:`unqualified path expression` with a generic argument.

.. code-block:: rust
Expand Down
4 changes: 2 additions & 2 deletions src/expressions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -685,13 +685,13 @@ The :t:`type` of a :t:`block expression` is determined as follows:
* :dp:`fls_ltEygvWDtHXE`
If the :t:`block expression` contains at least one :t:`break expression` and
has a :t:`tail expression`, then the :t:`type` is the :t:`unified type` of
the :t:`break types` of all :t:`[break expression]s` and the :t:`type` of the
the :t:`[break type]s` of all :t:`[break expression]s` and the :t:`type` of the
:t:`tail expression`.

* :dp:`fls_97v4fnekrRXI`
Otherwise, if the :t:`block expression` contains at least one
:t:`break expression`, then the :t:`type` is the :t:`unified type` of the
:t:`break types` of all :t:`[break expression]s`.
:t:`[break type]s` of all :t:`[break expression]s`.

* :dp:`fls_ob76y2ymdd27`
Otherwise, if the :t:`block expression` has a :t:`tail expression`, then the
Expand Down
4 changes: 2 additions & 2 deletions src/ffi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ An :t:`external block` is a :t:`construct` that provides the declarations of
foreign :t:`[function]s` as unchecked imports.

:dp:`fls_Nz0l16hMxqTd`
The :t:`ABI` of an :t:`extern block` is determined as follows:
The :t:`ABI` of an :t:`external block` is determined as follows:

* :dp:`fls_4XOoiFloXM7t`
If the :t:`extern block` specifies an :s:`AbiKind`, then the :t:`ABI` is the specified :s:`AbiKind`.
If the :t:`external block` specifies an :s:`AbiKind`, then the :t:`ABI` is the specified :s:`AbiKind`.

* :dp:`fls_PBsepNHImJKH`
Otherwise the :t:`ABI` is the :t:`extern C ABI`.
Expand Down
4 changes: 2 additions & 2 deletions src/functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ A :t:`function` shall not specify a :t:`self parameter` unless it is an
:t:`associated function`.

:dp:`fls_AAYJDCNMJgTq`
The :t:`type` of a :t:`parameter` is determined as follows:
The :t:`type` of a :t:`function parameter` is determined as follows:

* :dp:`fls_PGtp39f6gJwU`
If the :t:`parameter` is a :t:`self parameter` without a :s:`TypeSpecification`:
If the :t:`function parameter` is a :t:`self parameter` without a :s:`TypeSpecification`:

* :dp:`fls_yZ2yIXxmy2ri`
And the :t:`self parameter` has token ``&`` and :t:`keyword` ``mut``, then the :t:`type` is ``&mut Self``.
Expand Down
2 changes: 1 addition & 1 deletion src/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ adjusted call operand

:dp:`fls_mchqbc64iu0u`
An :dt:`adjusted call operand` is a :t:`call operand` with possible
:t:`auto dereferencing` adjustments.
:t:`auto-dereferencing` adjustments.

.. _fls_j775guurkgo4:

Expand Down
2 changes: 1 addition & 1 deletion src/macros.rst
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ the :t:`token` stream produced from the related :s:`EnumDeclaration`,

:dp:`fls_H5ipqqlH3pJh`
A :t:`derive macro` adds all its declared :t:`[derive helper attribute]s` into
the :t:`derive helper attribute scope` of the :t:`abstract data type` the
the :t:`derive helper attribute` scope of the :t:`abstract data type` the
:t:`attribute` is attached to.

:dp:`fls_mobky5ck1mi`
Expand Down
2 changes: 1 addition & 1 deletion src/statements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ token ``}``.
The :t:`expected type` of the :t:`pattern` of the :t:`let statement` is determined as follows:

* :dp:`fls_zObyLdya4DYc`
If the :t:`let statement` lacks a :t:`type ascription` and a :t:`let initializer, then the :t:`expected type` is the :t:`inferred type`.
If the :t:`let statement` lacks a :t:`type ascription` and a :t:`let initializer`, then the :t:`expected type` is the :t:`inferred type`.

* :dp:`fls_r38TXWKQPjxv`
If the :t:`let statement` lacks a :t:`type ascription`, then the :t:`expected type` is the :t:`type` of the :t:`let initializer`.
Expand Down
4 changes: 2 additions & 2 deletions src/types-and-traits.rst
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ Union Types

:dp:`fls_nskmnzq95yqm`
A :t:`union type` is an :t:`abstract data type` that is a sum of other
:t:`types`.
:t:`[type]s`.

:dp:`fls_I5fN5Fmo5CyK`
A :t:`union` without any :t:`[union field]s` is rejected, but may still be consumed by
Expand Down Expand Up @@ -1431,7 +1431,7 @@ For a :t:`thin pointer`, the :t:`size` and :t:`alignment` are those of :t:`type`

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

:dp:`fls_e5hivr6m5s3h`
For a :t:`fat pointer`, the :t:`size` and :t:`alignment` are tool-defined, but
Expand Down

0 comments on commit 2f68cc3

Please sign in to comment.