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

Remove the grammar from the reference #24729

Merged
merged 3 commits into from
Apr 25, 2015
Merged

Remove the grammar from the reference #24729

merged 3 commits into from
Apr 25, 2015

Conversation

mdinger
Copy link
Contributor

@mdinger mdinger commented Apr 23, 2015

From #24723 (comment) :

Yes, I've been meaning to just remove it in favor of GRAMMAR.md

  • steveklabnik

@rust-highfive
Copy link
Collaborator

r? @pcwalton

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

@mdinger
Copy link
Contributor Author

mdinger commented Apr 23, 2015

r? @steveklabnik

@mdinger mdinger force-pushed the reference_grammar branch from 3632de3 to 02bd862 Compare April 23, 2015 18:02
@mdinger
Copy link
Contributor Author

mdinger commented Apr 23, 2015

Updated with a few more removals. Searching for ebnf didn't find anything else but text may talk about the grammar still. You won't discover that without reading though.

@bors
Copy link
Contributor

bors commented Apr 24, 2015

☔ The latest upstream changes (presumably #24759) made this pull request unmergeable. Please resolve the merge conflicts.

@mdinger mdinger force-pushed the reference_grammar branch from 02bd862 to 54485dc Compare April 24, 2015 18:10
@mdinger
Copy link
Contributor Author

mdinger commented Apr 24, 2015

Rebased. Basically deletes the ebnf from the reference and moves some of the recent reference changes to the grammar. Until this is done, the reference is probably have a tendency to be more up to date than the grammar because that's what people look at.

The reference was definitely different at a few places suggesting more recent work.

@mdinger
Copy link
Contributor Author

mdinger commented Apr 24, 2015

Let me know when/if you want this. I'm gonna hold off on rebasing until then because I'll just need to keep doing it.

@steveklabnik
Copy link
Member

I do in the general case, yeah, but with the reference editing, people are changing it.

@mdinger
Copy link
Contributor Author

mdinger commented Apr 24, 2015

I can roll up the reference changes into one I think. That might work.

@mdinger mdinger force-pushed the reference_grammar branch from bc53811 to 8f2c399 Compare April 24, 2015 21:21
@mdinger
Copy link
Contributor Author

mdinger commented Apr 24, 2015

@steveklabnik This rolls all the reference changes into one PR

@steveklabnik
Copy link
Member

I'd rather let bors handle all those normally rather than doing some kind of manual rollup

@mdinger mdinger force-pushed the reference_grammar branch from 8f2c399 to 7089c5e Compare April 24, 2015 21:26
@mdinger
Copy link
Contributor Author

mdinger commented Apr 24, 2015

Okay. Reverted. I only did it because I was afraid of merge conflicts. I don't know how bors handles them.

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 24, 2015

📌 Commit 7089c5e has been approved by steveklabnik

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 24, 2015
@steveklabnik
Rollup merge of rust-lang#24729 - mdinger:reference_grammar, r=stevek…
6acd655 
…labnik

From rust-lang#24723 (comment) :

> Yes, I've been meaning to just remove it in favor of GRAMMAR.md
> - steveklabnik
@steveklabnik steveklabnik mentioned this pull request Apr 24, 2015
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 24, 2015
@steveklabnik
Rollup merge of rust-lang#24729 - mdinger:reference_grammar, r=stevek…
1640b0c 
…labnik

From rust-lang#24723 (comment) :

> Yes, I've been meaning to just remove it in favor of GRAMMAR.md
> - steveklabnik
@steveklabnik steveklabnik mentioned this pull request Apr 24, 2015
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 25, 2015
@steveklabnik
Rollup merge of rust-lang#24729 - mdinger:reference_grammar, r=stevek…
3c6c16e 
…labnik

From rust-lang#24723 (comment) :

> Yes, I've been meaning to just remove it in favor of GRAMMAR.md
> - steveklabnik
@steveklabnik steveklabnik mentioned this pull request Apr 25, 2015
Merged
bors added a commit that referenced this pull request Apr 25, 2015
@bors
Auto merge of #24798 - steveklabnik:rollup, r=steveklabnik
a40261a 
- Successful merges: #24662, #24722, #24725, #24729, #24736, #24749, #24751, #24766, #24769, #24772, #24775, #24790
- Failed merges: #24760
@bors bors merged commit 7089c5e into rust-lang:master Apr 25, 2015
@mdinger mdinger deleted the reference_grammar branch April 25, 2015 18:01
@mdinger mdinger mentioned this pull request Apr 25, 2015
Closed
@carols10cents carols10cents mentioned this pull request Apr 29, 2015
Merged
bors added a commit that referenced this pull request Apr 30, 2015
@bors
Auto merge of #24924 - carols10cents:grammar-improvements, r=pnkfelix
2568a4d 
I'm interested in helping out with #16676 but more in the grammar than the reference-- here's my first chunk, more to come!! 🎉 

I did pull a bit *out* of the reference, though, that was more relevant to the grammar but wasn't moved over as part of #24729.

I'm looking at, e.g. https://github.com/rust-lang/rust/blob/master/src/libsyntax/ast.rs, as the source of truth, please let me know if I should be checking against something else instead/in addition.

r? @steveklabnik
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@steveklabnik steveklabnik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mdinger @rust-highfive @bors @steveklabnik @pcwalton