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

implement RFC amendment 1462 (add [ to FOLLOW(ty)) #31152

Merged
merged 2 commits into from
Jan 26, 2016
Merged

implement RFC amendment 1462 (add [ to FOLLOW(ty)) #31152

merged 2 commits into from
Jan 26, 2016

Conversation

durka
Copy link
Contributor

@durka durka commented Jan 23, 2016

@durka durka force-pushed the ty-follow-bracket branch 2 times, most recently from 29f27fc to 84560bb Compare January 23, 2016 18:43
@durka durka force-pushed the ty-follow-bracket branch from 84560bb to e1e0de8 Compare January 23, 2016 21:37
@pnkfelix
Copy link
Member

@bors r+ e1e0de8

bors added a commit that referenced this pull request Jan 23, 2016
@bors
Auto merge of #31152 - durka:ty-follow-bracket, r=pnkfelix
d5fcdcc 
cc #31135 rust-lang/rfcs#1462 #30923 @retep998
r? @pnkfelix
@bors
Copy link
Contributor

bors commented Jan 23, 2016

⌛ Testing commit e1e0de8 with merge d5fcdcc...

@pnkfelix pnkfelix added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 23, 2016
@durka
Copy link
Contributor Author

durka commented Jan 23, 2016

@pnkfelix so it is correct to modify FOLLOW(path) as well? I wasn't clear on that from the RFC.

@pnkfelix
Copy link
Member

@durka oh wait, I overlooked that.

@bors r-

@pnkfelix
Copy link
Member

(man that is embarrassing, given that its pretty explciitly pointed out...)

@pnkfelix
Copy link
Member

( the RFC as written does says FOLLOW(path) = FOLLOW(ty); I need to double check whether that still makes sense in this context. it probably does, though, to be honest; I just need to double-check about the ramifications...)

@bors
Copy link
Contributor

bors commented Jan 24, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, 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, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@pnkfelix
Copy link
Member

Actually thinking on it further, I can't see how it could be wrong to put [ into FOLLOW of path. We aren't going to add it to the grammar for path expressions. (Especially since it already has a role in expr grammar)

@pnkfelix
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 24, 2016

📌 Commit e1e0de8 has been approved by pnkfelix

@pnkfelix
Copy link
Member

@bors r+ force

@bors
Copy link
Contributor

bors commented Jan 25, 2016

📌 Commit e1e0de8 has been approved by pnkfelix

@pnkfelix pnkfelix closed this Jan 25, 2016
@pnkfelix pnkfelix reopened this Jan 25, 2016
@pnkfelix
Copy link
Member

@bors r+ e1e0de8

@pnkfelix pnkfelix mentioned this pull request Jan 25, 2016
Open
@Manishearth Manishearth mentioned this pull request Jan 26, 2016
Closed
@bors
Copy link
Contributor

bors commented Jan 26, 2016

⌛ Testing commit e1e0de8 with merge 4086ba0...

Manishearth added a commit to Manishearth/rust that referenced this pull request Jan 26, 2016
@Manishearth
Rollup merge of rust-lang#31152 - durka:ty-follow-bracket, r=pnkfelix
b46bd2f 
cc rust-lang#31135 rust-lang/rfcs#1462 rust-lang#30923 @retep998
r? @pnkfelix
@Manishearth Manishearth mentioned this pull request Jan 26, 2016
Merged
@bors
Copy link
Contributor

bors commented Jan 26, 2016

⛄ The build was interrupted to prioritize another pull request.

bors added a commit that referenced this pull request Jan 26, 2016
@bors
Auto merge of #31210 - Manishearth:rollup, r=Manishearth
acf4aee 
- Successful merges: #31152, #31184, #31189, #31192, #31197, #31199, #31201
- Failed merges:
@bors bors merged commit e1e0de8 into rust-lang:master Jan 26, 2016
@durka
Copy link
Contributor Author

durka commented Jan 27, 2016

urgh, I forgot to update the Book.

@durka durka mentioned this pull request Jan 27, 2016
Merged
bors added a commit that referenced this pull request Jan 28, 2016
@bors
Auto merge of #31240 - durka:follow-set-docs, r=pnkfelix
035f4cc 
Missed as part of #31152, but the list had other mistakes as well.

r? @pnkfelix
@pnkfelix pnkfelix added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 1, 2016
@retep998 retep998 mentioned this pull request Feb 4, 2016
Closed
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 4, 2016
@pnkfelix pnkfelix mentioned this pull request Feb 5, 2016
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@durka @pnkfelix @bors @alexcrichton @nikomatsakis