Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

syntax: Allow semi tokens after macro ty/path #27000

Merged
merged 1 commit into from
Jul 13, 2015
Merged

syntax: Allow semi tokens after macro ty/path #27000

merged 1 commit into from
Jul 13, 2015

Conversation

alexcrichton
Copy link
Member

This commit expands the follow set of the ty and path macro fragments to
include the semicolon token as well. A semicolon is already allowed after these
tokens, so it's currently a little too restrictive to not have a semicolon
allowed. For example:

extern {
    fn foo() -> i32; // semicolon after type
}

fn main() {
    struct Foo;

    Foo; // semicolon after path
}

@alexcrichton
syntax: Allow semi tokens after macro ty/path
af55623 
This commit expands the follow set of the `ty` and `path` macro fragments to
include the semicolon token as well. A semicolon is already allowed after these
tokens, so it's currently a little too restrictive to not have a semicolon
allowed. For example:

    extern {
        fn foo() -> i32; // semicolon after type
    }

    fn main() {
        struct Foo;

        Foo; // semicolon after path
    }
@rust-highfive
Copy link
Collaborator

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

@sfackler
Copy link
Member

LGTM - I believe @cmr is the follow token czar though.

@emberian
Copy link
Member

Looking.

@emberian
Copy link
Member

👍, could you also send a PR to update the RFC text here

@emberian
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 13, 2015

📌 Commit af55623 has been approved by cmr

@bors
Copy link
Contributor

bors commented Jul 13, 2015

⌛ Testing commit af55623 with merge 9ff2d19...

bors added a commit that referenced this pull request Jul 13, 2015
@bors
Auto merge of #27000 - alexcrichton:semi-after-type, r=cmr
9ff2d19 
This commit expands the follow set of the `ty` and `path` macro fragments to
include the semicolon token as well. A semicolon is already allowed after these
tokens, so it's currently a little too restrictive to not have a semicolon
allowed. For example:

    extern {
        fn foo() -> i32; // semicolon after type
    }

    fn main() {
        struct Foo;

        Foo; // semicolon after path
    }
@bors
Copy link
Contributor

bors commented Jul 13, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt

@bors bors merged commit af55623 into rust-lang:master Jul 13, 2015
alexcrichton added a commit to alexcrichton/rfcs that referenced this pull request Jul 13, 2015
@alexcrichton
Update FOLLOW set for ty tokens
4083ad7 
Accounts for rust-lang/rust#27000
@alexcrichton alexcrichton mentioned this pull request Jul 13, 2015
Merged
@alexcrichton alexcrichton deleted the semi-after-type branch July 17, 2015 18:46
@brson brson added the relnotes Marks issues that should be documented in the release notes of the next release. label Jul 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@sfackler sfackler

Labels
relnotes Marks issues that should be documented in the release notes of the next release.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @sfackler @emberian @bors @brson