rust/src/libsyntax/parse/parser.rs, branch 1.21.0

Ensure that generic arguments don't end up in attribute paths.

2017-08-22T22:50:19+00:00

Auto merge of #43854 - estebank:missing-cond, r=nikomatsakis

2017-08-22T04:28:49+00:00

Point out missing if conditional On a case where an else conditional is missing, point this out instead of the token immediately after the (incorrect) else block: ``` error: missing condition for `if` statemementt push fork -f --> $DIR/issue-13483.rs:16:5 | 13 | } else if { | ^ expected if condition here ``` instead of ``` error: expected `{`, found `else` --> ../../src/test/ui/issue-13483.rs:14:7 | 14 | } else { | ^^^^ ``` Fix #13483.

Auto merge of #43540 - petrochenkov:pathrelax, r=nikomatsakis

2017-08-21T23:03:57+00:00

syntax: Relax path grammar TLDR: Accept the disambiguator `::` in "type" paths (`Type::`), accept the disambiguator `::` before parenthesized generic arguments (`Fn::(Args)`). The "turbofish" disambiguator `::<>` in expression paths is a necessary evil required for path parsing to be both simple and to give reasonable results. Since paths in expressions usually refer to values (but not necessarily, e.g. `Struct:: { field: 0 }` is disambiguated, but refers to a type), people often consider `::<>` to be inherent to *values*, and not *expressions* and want to write disambiguated paths for values even in contexts where disambiguation is not strictly necessary, for example when a path is passed to a macro `m!(Vec::::new)`. The problem is that currently, if the disambiguator is not *required*, then it's *prohibited*. This results in confusion - see https://github.com/rust-lang/rust/issues/41740, https://internals.rust-lang.org/t/macro-path-uses-novel-syntax/5561. This PR makes the disambiguator *optional* instead of prohibited in contexts where it's not strictly required, so people can pass paths to macros in whatever form they consider natural (e.g. disambiguated form for value paths). This PR also accepts the disambiguator in paths with parenthesized arguments (`Fn::(Args)`) for consistency and to simplify testing of stuff like https://github.com/rust-lang/rust/pull/41856#issuecomment-301219194. Closes https://github.com/rust-lang/rust/issues/41740 cc @rust-lang/lang r? @nikomatsakis

Verify that an `if` condition block returns a value

2017-08-18T03:25:46+00:00

Check for `else` keyword on missing `if` condition

2017-08-17T22:48:39+00:00

Point out missing if conditional

2017-08-17T17:18:06+00:00

On a case where an else conditional is missing, point this out instead of the token immediately after the (incorrect) else block: ``` error: missing condition for `if` statemementt push fork -f --> $DIR/issue-13483.rs:16:5 | 13 | } else if { | ^ expected if condition here ``` instead of ``` error: expected `{`, found `else` --> ../../src/test/ui/issue-13483.rs:14:7 | 14 | } else { | ^^^^ ```

use field init shorthand EVERYWHERE

2017-08-15T22:29:17+00:00

Like #43008 (f668999), but _much more aggressive_.

Include 'let' keyword to the span for ast::Local

2017-08-12T09:00:57+00:00

Issue warnings for unnecessary path disambiguators

2017-08-10T23:47:22+00:00

syntax: Relax path grammar

2017-08-10T23:06:27+00:00