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.

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

Remove the grammar from the reference #24729

Merged
merged 3 commits into from Apr 25, 2015

Conversation

Projects
None yet
5 participants
@mdinger
Contributor

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

This comment has been minimized.

Show comment
Hide comment
@rust-highfive

rust-highfive Apr 23, 2015

Collaborator

r? @pcwalton

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

Collaborator

rust-highfive commented Apr 23, 2015

r? @pcwalton

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

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger
Contributor

mdinger commented Apr 23, 2015

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 23, 2015

Contributor

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.

Contributor

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

This comment has been minimized.

Show comment
Hide comment
@bors

bors Apr 24, 2015

Contributor

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

Contributor

bors commented Apr 24, 2015

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

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 24, 2015

Contributor

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.

Contributor

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

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 24, 2015

Contributor

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.

Contributor

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

This comment has been minimized.

Show comment
Hide comment
@steveklabnik

steveklabnik Apr 24, 2015

Member

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

Member

steveklabnik commented Apr 24, 2015

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

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 24, 2015

Contributor

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

Contributor

mdinger commented Apr 24, 2015

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

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 24, 2015

Contributor

@steveklabnik This rolls all the reference changes into one PR

Contributor

mdinger commented Apr 24, 2015

@steveklabnik This rolls all the reference changes into one PR

@steveklabnik

This comment has been minimized.

Show comment
Hide comment
@steveklabnik

steveklabnik Apr 24, 2015

Member

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

Member

steveklabnik commented Apr 24, 2015

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

@mdinger

This comment has been minimized.

Show comment
Hide comment
@mdinger

mdinger Apr 24, 2015

Contributor

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

Contributor

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

This comment has been minimized.

Show comment
Hide comment
@steveklabnik

steveklabnik Apr 24, 2015

Member

@bors: r+ rollup

Member

steveklabnik commented Apr 24, 2015

@bors: r+ rollup

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Apr 24, 2015

Contributor

📌 Commit 7089c5e has been approved by steveklabnik

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

Rollup merge of #24729 - mdinger:reference_grammar, r=steveklabnik
From rust-lang#24723 (comment) :

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

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 24, 2015

Rollup merge of #24729 - mdinger:reference_grammar, r=steveklabnik
From rust-lang#24723 (comment) :

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

bors added a commit that referenced this pull request Apr 25, 2015

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 25, 2015

Rollup merge of #24729 - mdinger:reference_grammar, r=steveklabnik
From rust-lang#24723 (comment) :

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

bors added a commit that referenced this pull request Apr 25, 2015

@bors bors merged commit 7089c5e into rust-lang:master Apr 25, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mdinger mdinger deleted the mdinger:reference_grammar branch Apr 25, 2015

@mdinger mdinger referenced this pull request Apr 25, 2015

Closed

Audit reference manual before 1.0 #16676

59 of 150 tasks complete

bors added a commit that referenced this pull request Apr 30, 2015

Auto merge of #24924 - carols10cents:grammar-improvements, r=pnkfelix
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

bors added a commit that referenced this pull request Apr 30, 2015

Auto merge of #24924 - carols10cents:grammar-improvements, r=pnkfelix
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