Skip to content

Commit bbbcec6

Browse files
TysonAndrenikic
authored andcommitted
Fixes #217: Incorrect rule for trait-select-insteadof-clause
An example of the insteadof clause (satisfies the fixed rule): `use T1,T2,T3{T1::foo insteadof T2,T3;}`
1 parent 8f78136 commit bbbcec6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: spec/16-traits.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ trait-select-and-alias-clause:
139139
trait-alias-as-clause ';'
140140
141141
trait-select-insteadof-clause:
142-
name 'insteadof' name
142+
qualified-name '::' name 'insteadof' trait-name-list
143143
144144
trait-alias-as-clause:
145145
name 'as' visibility-modifier? name
@@ -171,7 +171,7 @@ trait-alias-as-clause:
171171
<i><a href="#grammar-trait-alias-as-clause">trait-alias-as-clause</a></i> ;
172172

173173
<i id="grammar-trait-select-insteadof-clause">trait-select-insteadof-clause:</i>
174-
<i><a href="09-lexical-structure.md#grammar-name">name</a></i> insteadof <i><a href="09-lexical-structure.md#grammar-name">name</a></i>
174+
<i><a href="09-lexical-structure.md#grammar-qualified-name">qualified-name</a></i> :: <i><a href="09-lexical-structure.md#grammar-name">name</a></i> insteadof <i><a href="#grammar-trait-name-list">trait-name-list</a></i>
175175

176176
<i id="grammar-trait-alias-as-clause">trait-alias-as-clause:</i>
177177
<i><a href="09-lexical-structure.md#grammar-name">name</a></i> as <i><a href="14-classes.md#grammar-visibility-modifier">visibility-modifier</a></i><sub>opt</sub> <i><a href="09-lexical-structure.md#grammar-name">name</a></i>

Diff for: spec/19-grammar.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ The grammar notation is described in [Grammars section](09-lexical-structure.md#
10951095
<i><a href="#grammar-trait-alias-as-clause">trait-alias-as-clause</a></i> ;
10961096

10971097
<i id="grammar-trait-select-insteadof-clause">trait-select-insteadof-clause:</i>
1098-
<i><a href="#grammar-name">name</a></i> insteadof <i><a href="#grammar-name">name</a></i>
1098+
<i><a href="#grammar-qualified-name">qualified-name</a></i> :: <i><a href="#grammar-name">name</a></i> insteadof <i><a href="#grammar-trait-name-list">trait-name-list</a></i>
10991099

11001100
<i id="grammar-trait-alias-as-clause">trait-alias-as-clause:</i>
11011101
<i><a href="#grammar-name">name</a></i> as <i><a href="#grammar-visibility-modifier">visibility-modifier</a></i><sub>opt</sub> <i><a href="#grammar-name">name</a></i>

0 commit comments

Comments
 (0)