Skip to content

Commit e660f3d

Browse files
Merge #480
480: Update to 1.75.0 r=pietroalbini a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
2 parents caa9ca8 + 2516c3b commit e660f3d

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

src/associated-items.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ within a :t:`trait`.
107107
An :t:`associated trait function` is an :t:`associated function` that appears
108108
within a :t:`trait`.
109109

110+
:dp:`fls_2TRwCz38kuRz`
111+
An :t:`associated trait function` shall not be subject to :t:`keyword` ``const``.
112+
113+
:dp:`fls_WnsVATJvUdza`
114+
Every occurrence of an :t:`impl trait type` in the :t:`return type` of an
115+
:t:`associated trait function` is equivalent to referring to a new
116+
anonymous :t:`associated trait type` of the :t:`implemented trait`.
117+
110118
:dp:`fls_yyhebj4qyk34`
111119
An :t:`associated trait type` is an :t:`associated type` that appears within
112120
a :t:`trait`.
@@ -136,6 +144,16 @@ is equivalent to a :t:`where clause` of the following form:
136144
type X;
137145
}
138146
147+
:dp:`fls_amWtS80fPtza`
148+
An :t:`associated trait implementation function` is an :t:`associated function`
149+
that appears within a :t:`trait implementation`.
150+
151+
:dp:`fls_Cu8FWrisrqz1`
152+
Every occurrence of an :t:`impl trait type` in the :t:`return type` of an
153+
:t:`associated trait implementation function` is equivalent to referring to the
154+
corresponding :t:`associated trait type` of the corresponding :t:`associated
155+
trait function`.
156+
139157
:dp:`fls_oy92gzxgc273`
140158
A :t:`method` is an :t:`associated function` with a :t:`self parameter`.
141159

src/expressions.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ The :t:`evaluation` of a :t:`constant expression` that results in
345345
It is a static error if a :t:`constant expression` either :t:`[panic]s` or
346346
control reaches the invocation of :t:`macro` :std:`core::panic`.
347347

348+
:dp:`fls_XopG4yS9Q4q1`
349+
It is a static error if the evaluation of a :t:`constant expression` results in
350+
a :t:`value` that is unaligned.
351+
348352
.. rubric:: Dynamic Semantics
349353

350354
:dp:`fls_tg0kya5125jt`

src/glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4526,7 +4526,7 @@ null
45264526
^^^^
45274527

45284528
:dp:`fls_8sh17t37b2ml`
4529-
A :dc:`null` :t:`value` denotes a tool-defined address.
4529+
A :dc:`null` :t:`value` denotes the address ``0``.
45304530

45314531
.. _fls_a0qsojiymgjy:
45324532

0 commit comments

Comments
 (0)