diff options
| author | bors <bors@rust-lang.org> | 2016-04-06 13:44:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-06 13:44:51 -0700 |
| commit | bf5da36f1dfae45941ec39ef67a41fdbd22c1a50 (patch) | |
| tree | c019fe043d842df6d5e19c131d304cb541f7e7a8 /src/libsyntax/parse | |
| parent | 943ec3bdfc9ba28e94b6d00a2b53fb2cd8b21655 (diff) | |
| parent | 862ae9aa75b073f4d753aa8275fb139ab9729d74 (diff) | |
| download | rust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.tar.gz rust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.zip | |
Auto merge of #32778 - steveklabnik:rollup, r=steveklabnik
Rollup of 12 pull requests - Successful merges: #31762, #32538, #32634, #32668, #32679, #32691, #32724, #32727, #32744, #32761, #32766, #32774 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 9dc661ed2ea..b8c926f8de9 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1188,12 +1188,12 @@ impl<'a> Parser<'a> { -> PResult<'a, TyKind> { /* - [unsafe] [extern "ABI"] fn <'lt> (S) -> T - ^~~~^ ^~~~^ ^~~~^ ^~^ ^ - | | | | | - | | | | Return type - | | | Argument types - | | Lifetimes + [unsafe] [extern "ABI"] fn (S) -> T + ^~~~^ ^~~~^ ^~^ ^ + | | | | + | | | Return type + | | Argument types + | | | ABI Function Style */ |