Skip to content

Commit e1a1bb3

Browse files
committed
clarify which edition is which in reference explanation
1 parent 95f5788 commit e1a1bb3

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

text/0000-edition-based-method-disambiguation.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ field.
115115

116116
During method resolution, when we detect an ambiguity we should then check if
117117
one of the methods in question is a standard libary method with an `edition`
118-
field. When it exists and the edition field of that method matches the current
119-
edition we ignore that method and select the other method that conflicted with
120-
it and generate a warning. If the edition is a previous edition we continue as
121-
normal and emit an error for the ambiguity.
118+
field. When the edition field exists in the stability attribute and the edition
119+
field of that method matches the current crate's edition we ignore that method
120+
and select the pre-edition method that conflicted with it and generate a
121+
warning. If the edition field in the stability attribute is an earlier edition
122+
than the crate's edition we continue as normal and emit an error for the
123+
ambiguity.
122124

123125
This flag should be usable to resolve the following forms of breakage:
124126

0 commit comments

Comments
 (0)