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 legacy grammar #64896

Merged
merged 1 commit into from
Oct 1, 2019
Merged

Remove legacy grammar #64896

merged 1 commit into from
Oct 1, 2019

Conversation

XAMPPRocky
Copy link
Member

Revival of #50835 & #55545

On the #wg-grammar discord there was agreement that enough progress has been made to be able to remove the legacy grammar.

r? @Centril @qmx

cc @rust-lang/wg-grammar

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2019
@ehuss
Copy link
Contributor

ehuss commented Sep 29, 2019

For src/doc/grammar.md, I would add a redirect, or a placeholder page that indicates where it may be found. There are still a lot of links to it in the wild. Maybe something like this:

The Rust grammar may now be found in the reference. Additionally, the grammar working group is working on producing a testable grammar.

@Centril
Copy link
Contributor

Centril commented Sep 29, 2019

r=me with redirect suggested by @ehuss set-up.

@XAMPPRocky
Copy link
Member Author

@Centril Updated with suggestion.

@Centril
Copy link
Contributor

Centril commented Sep 29, 2019

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Sep 29, 2019

📌 Commit 825a6ab has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 29, 2019
@Centril
Rollup merge of rust-lang#64896 - XAMPPRocky:remove-grammar, r=Centril
7e785d0 
Remove legacy grammar

Revival of rust-lang#50835 & rust-lang#55545

On the #wg-grammar discord there was agreement that enough progress has been made to be able to remove the legacy grammar.

r? @Centril @qmx

cc @rust-lang/wg-grammar
@Centril Centril mentioned this pull request Sep 29, 2019
Closed
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-09-29T16:29:03.8633258Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-29T16:29:03.8827645Z ##[command]git config gc.auto 0
2019-09-29T16:29:03.8891778Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-29T16:29:03.8953361Z ##[command]git config --get-all http.proxy
2019-09-29T16:29:03.9092657Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64896/merge:refs/remotes/pull/64896/merge
---
2019-09-29T17:31:00.3668703Z .................................................................................................... 1500/9071
2019-09-29T17:31:06.9906635Z .................................................................................................... 1600/9071
2019-09-29T17:31:16.7255514Z ...............................................................................................i.... 1700/9071
2019-09-29T17:31:25.7879172Z ...........i........................................................................................ 1800/9071
2019-09-29T17:31:32.5217924Z ......................................................................................iiiii......... 1900/9071
2019-09-29T17:31:54.9724115Z .................................................................................................... 2100/9071
2019-09-29T17:31:57.5069007Z .................................................................................................... 2200/9071
2019-09-29T17:32:00.1932876Z .................................................................................................... 2300/9071
2019-09-29T17:32:06.8273646Z .................................................................................................... 2400/9071
---
2019-09-29T17:35:07.3995248Z ..........................................................................i...............i......... 4700/9071
2019-09-29T17:35:16.0505963Z .................................................................................................... 4800/9071
2019-09-29T17:35:25.8824666Z .................................................................................................... 4900/9071
2019-09-29T17:35:32.4620620Z .................................................................................................... 5000/9071
2019-09-29T17:35:43.6559860Z ..............................................................ii.ii................................. 5100/9071
2019-09-29T17:35:53.8210852Z .................................................................................................... 5300/9071
2019-09-29T17:36:03.7242176Z .................................................................................................... 5400/9071
2019-09-29T17:36:11.5221195Z ............................i....................................................................... 5500/9071
2019-09-29T17:36:17.6984353Z .................................................................................................... 5600/9071
2019-09-29T17:36:17.6984353Z .................................................................................................... 5600/9071
2019-09-29T17:36:29.9598204Z .................................................................................................... 5700/9071
2019-09-29T17:36:41.3793377Z .......................ii...i..ii...........i....................................................... 5800/9071
2019-09-29T17:37:03.7757483Z .................................................................................................... 6000/9071
2019-09-29T17:37:12.3892865Z .................................................................................................... 6100/9071
2019-09-29T17:37:12.3892865Z .................................................................................................... 6100/9071
2019-09-29T17:37:27.6601738Z ..........................i..ii..................................................................... 6200/9071
2019-09-29T17:37:47.2492098Z ......................................................................................i............. 6400/9071
2019-09-29T17:37:49.6048927Z .................................................................................................... 6500/9071
2019-09-29T17:37:52.0651325Z ..........................................................i......................................... 6600/9071
2019-09-29T17:37:55.2316584Z .................................................................................................... 6700/9071
---
2019-09-29T17:42:28.1681559Z  finished in 5.419
2019-09-29T17:42:28.1875836Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:42:28.3523971Z 
2019-09-29T17:42:28.3524129Z running 150 tests
2019-09-29T17:42:31.6903599Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-09-29T17:42:33.7000165Z ..iiii..............i.........iii.i.......ii......
2019-09-29T17:42:33.7000992Z 
2019-09-29T17:42:33.7006839Z  finished in 5.513
2019-09-29T17:42:33.7196912Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:42:33.8807437Z 
---
2019-09-29T17:42:35.9779942Z  finished in 2.258
2019-09-29T17:42:35.9982789Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:42:36.1596939Z 
2019-09-29T17:42:36.1598533Z running 9 tests
2019-09-29T17:42:36.1599690Z iiiiiiiii
2019-09-29T17:42:36.1600160Z 
2019-09-29T17:42:36.1603317Z  finished in 0.162
2019-09-29T17:42:36.1802355Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:42:36.3405842Z 
---
2019-09-29T17:42:55.4648842Z  finished in 18.536
2019-09-29T17:42:55.4649154Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:42:55.4649225Z 
2019-09-29T17:42:55.4649273Z running 123 tests
2019-09-29T17:43:19.3431959Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-29T17:43:24.1146494Z i.i.i......iii.i.....ii
2019-09-29T17:43:24.1149691Z 
2019-09-29T17:43:24.1150305Z  finished in 29.376
2019-09-29T17:43:24.1158772Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T17:43:24.1160632Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-29T17:56:32.2986042Z 
2019-09-29T17:56:32.2987167Z    Doc-tests core
2019-09-29T17:56:37.3689176Z 
2019-09-29T17:56:37.3690306Z running 2405 tests
2019-09-29T17:56:48.8685057Z ......iiiii......................................................................................... 100/2405
2019-09-29T17:56:59.9318662Z ...............................................................................ii................... 200/2405
2019-09-29T17:57:26.2659737Z .i.................................................................................................. 400/2405
2019-09-29T17:57:26.2659737Z .i.................................................................................................. 400/2405
2019-09-29T17:57:37.2152358Z ................................................i..i.................iiii........................... 500/2405
2019-09-29T17:57:58.2561684Z .................................................................................................... 700/2405
2019-09-29T17:58:09.0619698Z .................................................................................................... 800/2405
2019-09-29T17:58:19.8772429Z .................................................................................................... 900/2405
2019-09-29T17:58:30.6174703Z .................................................................................................... 1000/2405
---
2019-09-29T18:02:49.4960658Z 
2019-09-29T18:02:49.4960978Z running 992 tests
2019-09-29T18:03:11.7063763Z i................................................................................................... 100/992
2019-09-29T18:03:23.6683188Z .................................................................................................... 200/992
2019-09-29T18:03:32.1472283Z .................iii......i......i...i......i....................................................... 300/992
2019-09-29T18:03:38.0462377Z .................................................................................................... 400/992
2019-09-29T18:03:46.0989969Z ...................................i..i.................................ii.......................... 500/992
2019-09-29T18:04:01.5835674Z .................................................................................................... 700/992
2019-09-29T18:04:01.5835674Z .................................................................................................... 700/992
2019-09-29T18:04:09.9938154Z ..................iiii.............................................................................. 800/992
2019-09-29T18:04:25.2241305Z .................................................................................................... 900/992
2019-09-29T18:04:33.0208766Z ........................................iiii................................................
2019-09-29T18:04:33.0210954Z 
2019-09-29T18:04:33.0270624Z  finished in 198.526
2019-09-29T18:04:33.0285097Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-29T18:04:33.2390154Z    Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-09-29T18:18:18.0905375Z Rustbook (x86_64-unknown-linux-gnu) - book/first-edition
2019-09-29T18:18:18.2171473Z Rustbook (x86_64-unknown-linux-gnu) - book/second-edition
2019-09-29T18:18:18.4904373Z Rustbook (x86_64-unknown-linux-gnu) - book/2018-edition
2019-09-29T18:18:18.7781203Z Documenting standalone (x86_64-unknown-linux-gnu)
2019-09-29T18:18:18.9523933Z error: invalid markdown file: no initial lines starting with `# ` or `%`
2019-09-29T18:18:18.9526385Z 
2019-09-29T18:18:18.9526465Z 
2019-09-29T18:18:18.9526465Z 
2019-09-29T18:18:18.9531591Z command did not execute successfully: "/checkout/obj/build/bootstrap/debug/rustdoc" "--html-after-content" "/checkout/src/doc/footer.inc" "--html-before-content" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc/version_info.html" "--html-in-header" "/checkout/src/doc/favicon.inc" "--markdown-no-toc" "--index-page" "/checkout/src/doc/index.md" "--markdown-playground-url" "https://play.rust-lang.org/" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc" "/checkout/src/doc/grammar.md" "--markdown-css" "rust.css"
2019-09-29T18:18:18.9532263Z 
2019-09-29T18:18:18.9532298Z 
2019-09-29T18:18:18.9543928Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-29T18:18:18.9544237Z Build completed unsuccessfully in 1:41:59
2019-09-29T18:18:18.9544237Z Build completed unsuccessfully in 1:41:59
2019-09-29T18:18:18.9601776Z == clock drift check ==
2019-09-29T18:18:18.9616526Z   local time: Sun Sep 29 18:18:18 UTC 2019
2019-09-29T18:18:19.0578896Z   network time: Sun, 29 Sep 2019 18:18:19 GMT
2019-09-29T18:18:19.0582315Z == end clock drift check ==
2019-09-29T18:18:21.4388985Z ##[error]Bash exited with code '1'.
2019-09-29T18:18:21.4440826Z ##[section]Starting: Checkout
2019-09-29T18:18:21.4442802Z ==============================================================================
2019-09-29T18:18:21.4442873Z Task         : Get sources
2019-09-29T18:18:21.4442921Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Centril
Copy link
Contributor

Centril commented Sep 29, 2019

@bors r- ^--

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 29, 2019
@XAMPPRocky
Copy link
Member Author

@Centril TIL, that that is required. Updated the PR to keep the original % Grammar

@Centril
Copy link
Contributor

Centril commented Sep 30, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 30, 2019

📌 Commit 96c8049 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64896 - XAMPPRocky:remove-grammar, r=Centril
b8c5d3a 
Remove legacy grammar

Revival of rust-lang#50835 & rust-lang#55545

On the #wg-grammar discord there was agreement that enough progress has been made to be able to remove the legacy grammar.

r? @Centril @qmx

cc @rust-lang/wg-grammar
@Centril Centril mentioned this pull request Oct 1, 2019
Merged
bors added a commit that referenced this pull request Oct 1, 2019
@bors
Auto merge of #64946 - Centril:rollup-66mj5o0, r=Centril
702b45e 
Rollup of 10 pull requests

Successful merges:

 - #63674 (syntax: Support modern attribute syntax in the `meta` matcher)
 - #63931 (Stabilize macros in some more positions)
 - #64887 (syntax: recover trailing `|` in or-patterns)
 - #64895 (async/await: improve not-send errors)
 - #64896 (Remove legacy grammar)
 - #64907 (A small amount of tidying-up factored out from PR #64648)
 - #64928 (Add tests for some issues)
 - #64930 (Silence unreachable code lint from await desugaring)
 - #64935 (Improve code clarity)
 - #64937 (Deduplicate closure type errors)

Failed merges:

r? @ghost
@bors bors merged commit 96c8049 into rust-lang:master Oct 1, 2019
@XAMPPRocky XAMPPRocky deleted the remove-grammar branch October 1, 2019 11:58
@ehuss ehuss mentioned this pull request Oct 1, 2019
Closed
@jonas-schievink jonas-schievink mentioned this pull request Feb 20, 2020
Closed
@Enselic Enselic mentioned this pull request Sep 24, 2023
Closed
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jan 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Centril Centril

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@XAMPPRocky @ehuss @Centril @bors @rust-highfive