Grammar: Paths

This includes a variety of things all related to paths:

- Paths
- Path expressions
- Method call expression
- Attribute clarifications
- Visibility fixes

Author: ehuss

src/attributes.md

@@ -11,14 +11,14 @@
 >    `#[` MetaItem `]`
 >
 > _MetaItem_ :\
->       IDENTIFIER\
->    | IDENTIFIER `=` LITERAL\
->    | IDENTIFIER `(` _MetaSeq_ `)`
+>       [_SimplePath_]\
+> &nbsp;&nbsp; | [_SimplePath_] `=` [_LiteralExpression_]<sub>_without suffix_</sub>\
+> &nbsp;&nbsp; | [_SimplePath_] `(` _MetaSeq_ `)`
 >
 > _MetaSeq_ :\
 > &nbsp;&nbsp; &nbsp;&nbsp; EMPTY\
 > &nbsp;&nbsp; | _MetaItem_\
-> &nbsp;&nbsp; | LITERAL\
+> &nbsp;&nbsp; | [_LiteralExpression_]<sub>_without suffix_</sub>\
 > &nbsp;&nbsp; | _MetaItem_ `,` _MetaSeq_
 
 An _attribute_ is a general, free-form metadatum that is interpreted according
@@ -33,6 +33,8 @@ Attributes may appear as any of:
 * An identifier followed by a parenthesized list of sub-attribute arguments
   which include literals
 
+Literal values must not include integer or float type suffixes.
+
 _Inner attributes_, written with a bang ("!") after the hash ("#"), apply to the
 item that the attribute is declared within. _Outer attributes_, written without
 the bang after the hash, apply to the thing that follows the attribute.
@@ -522,6 +524,8 @@ impl<T: PartialEq> PartialEq for Foo<T> {
 
 You can implement `derive` for your own traits through [procedural macros].
 
+[_LiteralExpression_]: expressions/literal-expr.html
+[_SimplePath_]: paths.html#simple-paths
 [Doc comments]: comments.html#doc-comments
 [The Rustdoc Book]: ../rustdoc/the-doc-attribute.html
 [procedural macros]: procedural-macros.html

src/expressions/method-call-expr.md

@@ -1,7 +1,11 @@
 # Method-call expressions
 
+> **<sup>Syntax</sup>**\
+> _MethodCallExpression_ :\
+> &nbsp;&nbsp; [_Expression_] `.` [_PathExprSegment_] `(`[_CallParams_]<sup>?</sup> `)`
+
 A _method call_ consists of an expression (the *receiver*) followed by a single
-dot, an [identifier], and a parenthesized expression-list. Method calls are
+dot, an expression path segment, and a parenthesized expression-list. Method calls are
 resolved to associated [methods] on specific traits, either statically
 dispatching to a method if the exact `self`-type of the left-hand-side is known,
 or dynamically dispatching if the left-hand-side expression is an indirect
@@ -93,7 +97,9 @@ method and you'll be fine.
 
 </div>
 
-[IDENTIFIER]: identifiers.html
+[_CallParams_]: expressions/call-expr.html
+[_Expression_]: expressions.html
+[_PathExprSegment_]: paths.html#paths-in-expressions
 [visible]: visibility-and-privacy.html
 [array]: types.html#array-and-slice-types
 [trait objects]: types.html#trait-objects

src/expressions/operator-expr.md

@@ -460,4 +460,4 @@ assert_eq!(x, 14);
 [_CompoundAssignmentExpression_]: #compound-assignment-expressions
 
 [_Expression_]: expressions.html
-[_PathInExpression_]: paths.html
+[_PathInExpression_]: paths.html#paths-in-expressions

src/expressions/path-expr.md

@@ -1,5 +1,10 @@
 # Path expressions
 
+> **<sup>Syntax</sup>**\
+> _PathExpression_ :\
+> &nbsp;&nbsp; &nbsp;&nbsp; [_PathInExpression_]\
+> &nbsp;&nbsp; | [_QualifiedPathInExpression_]
+
 A [path] used as an expression context denotes either a local
 variable or an item. Path expressions that resolve to local or static variables
 are [place expressions], other paths are [value expressions]. Using a
@@ -19,8 +24,10 @@ let push_integer = Vec::<i32>::push;
 let slice_reverse = <[i32]>::reverse;
 ```
 
+[_PathInExpression_]: paths.html#paths-in-expressions
+[_QualifiedPathInExpression_]: paths.html#qualified-paths
 [place expressions]: expressions.html#place-expressions-and-value-expressions
 [value expressions]: expressions.html#place-expressions-and-value-expressions
 [path]: paths.html
 [`static mut`]: items/static-items.html#mutable-statics
-[`unsafe` block]: expressions/block-expr.html#unsafe-blocks
+[`unsafe` block]: expressions/block-expr.html#unsafe-blocks

src/items/structs.md

@@ -25,15 +25,15 @@
 >
 > _StructField_ :\
 > &nbsp;&nbsp; [_OuterAttribute_]<sup>\*</sup>\
-> &nbsp;&nbsp; [_Visibility_]
+> &nbsp;&nbsp; [_Visibility_]<sup>?</sup>\
 > &nbsp;&nbsp; [IDENTIFIER] `:` [_Type_]
 >
 > _TupleFields_ :\
 > &nbsp;&nbsp; _TupleField_ (`,` _TupleField_)<sup>\*</sup> `,`<sup>?</sup>
 >
 > _TupleField_ :\
 > &nbsp;&nbsp; [_OuterAttribute_]<sup>\*</sup>\
-> &nbsp;&nbsp; [_Visibility_]
+> &nbsp;&nbsp; [_Visibility_]<sup>?</sup>\
 > &nbsp;&nbsp; [_Type_]
 
 A _struct_ is a nominal [struct type] defined with the keyword `struct`.

src/items/use-declarations.md

@@ -2,7 +2,7 @@
 
 > **<sup>Syntax:</sup>**\
 > _UseDeclaration_ :\
-> &nbsp;&nbsp; ([_Visibility_])<sup>?</sup> `use` _UseTree_ `;`
+> &nbsp;&nbsp; [_Visibility_]<sup>?</sup> `use` _UseTree_ `;`
 >
 > _UseTree_ :\
 > &nbsp;&nbsp; &nbsp;&nbsp; ([_SimplePath_]<sup>?</sup> `::`)<sup>?</sup> `*`\
@@ -123,5 +123,5 @@ fn main() {}
 ```
 
 [IDENTIFIER]: identifiers.html
-[_SimplePath_]: paths.html
+[_SimplePath_]: paths.html#simple-paths
 [_Visibility_]: visibility-and-privacy.html