Rollup of 6 pull requests #68854

Centril · 2020-02-05T08:40:18Z

Successful merges:

Strip unnecessary subexpression #68762 (Strip unnecessary subexpression)
parse: towards unified fn grammar #68788 (Towards unified fn grammar)
Improve merge_from_succ #68790 (Improve merge_from_succ)
Clean up E0264, E0267 and E0268 explanations #68832 (Clean up E0264, E0267 and E0268 explanations)
On suggesting #![recursion_limit = "X"], note current crate name #68840 (On suggesting #![recursion_limit = "X"], note current crate name)
Fix issue number of capacity method #68851 (Fix issue number of capacity method)

Failed merges:

It became unnecessary since a06baa5 reformatted the file.

This function has a variable `changed` that is erroneously used for two related-but-different purpose: - to detect if the current element has changed; - to detect if any elements have changed. As a result, its use for the first purpose is broken, because if any prior element changed then the code always thinks the current element has changed. This is only a performance bug, not a correctness bug, because we frequently end up calling `assign_unpacked` unnecessarily to overwrite the element with itself. This commit adds `any_changed` to correctly distinguish between the two purposes. This is a small perf win for some benchmarks.

This is a small perf win.

also refactor `FnKind` and `visit_assoc_item` visitors

Strip unnecessary subexpression It became unnecessary since a06baa5 reformatted the file. The comment is currently a bit misleading.

@petrochenkov

…henkov Towards unified `fn` grammar Part of rust-lang#68728. - Syntactically, `fn` items in `extern { ... }` blocks can now have bodies (`fn foo() { ... }` as opposed to `fn foo();`). As above, we use semantic restrictions instead. - Syntactically, `fn` items in free contexts (directly in a file or a module) can now be without bodies (`fn foo();` as opposed to `fn foo() { ... }`. As above, we use semantic restrictions instead, including for non-ident parameter patterns. - We move towards unifying the `fn` front matter; this is fully realized in rust-lang#68728. r? @petrochenkov

@nikomatsakis

…, r=nikomatsakis Improve `merge_from_succ` A couple of small performance wins. r? @nikomatsakis

@Dylan-DPC

…, r=estebank Clean up E0264, E0267 and E0268 explanations r? @Dylan-DPC

@estebank

On suggesting `#![recursion_limit = "X"]`, note current crate name This would have saved me much confusion e.g. when reading the log output in rust-lang#68788 (comment). r? @estebank

@alexcrichton

Fix issue number of `capacity` method Follow-up of rust-lang#68558 (comment) r? @alexcrichton

Centril · 2020-02-05T08:40:34Z

@bors r+ p=6 rollup=never

bors · 2020-02-05T08:40:36Z

📌 Commit 68d523a has been approved by Centril

bors · 2020-02-05T08:41:12Z

⌛ Testing commit 68d523a with merge 694c3b52c0733a10d3dede27a53399cd439b1179...

rust-highfive · 2020-02-05T08:50:30Z

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.

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)

bors · 2020-02-05T08:50:45Z

💔 Test failed - checks-azure

Centril · 2020-02-05T08:51:21Z

@bors retry

bors · 2020-02-05T08:51:43Z

⌛ Testing commit 68d523a with merge a16ed032d90cad94bdd6f3483f52a60b3ebd21b1...

rust-highfive · 2020-02-05T10:38:56Z

The job x86_64-msvc-cargo 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.

2020-02-05T10:36:58.7021428Z    Compiling aho-corasick v0.6.3
2020-02-05T10:36:59.0815410Z    Compiling csv-core v0.1.3
2020-02-05T10:36:59.3769618Z    Compiling chan v0.1.19
2020-02-05T10:37:00.0513071Z    Compiling quickcheck v0.4.1
2020-02-05T10:37:00.1937513Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.1947754Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:489:17
2020-02-05T10:37:00.1948029Z     |
2020-02-05T10:37:00.1948226Z 489 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.1948631Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.1948840Z ...
2020-02-05T10:37:00.1949272Z 540 | / unsigned_arbitrary! {
2020-02-05T10:37:00.1949484Z 541 | |     usize, u8, u16, u32, u64
2020-02-05T10:37:00.1950077Z     | |_- in this macro invocation
2020-02-05T10:37:00.1950338Z 
2020-02-05T10:37:00.1950553Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.1950553Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.1950766Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:489:17
2020-02-05T10:37:00.1950989Z     |
2020-02-05T10:37:00.1951450Z 489 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.1951646Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.1951841Z ...
2020-02-05T10:37:00.1952024Z 540 | / unsigned_arbitrary! {
2020-02-05T10:37:00.1952194Z 541 | |     usize, u8, u16, u32, u64
2020-02-05T10:37:00.1952544Z     | |_- in this macro invocation
2020-02-05T10:37:00.1952707Z 
2020-02-05T10:37:00.1952874Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.1952874Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.1953695Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:489:17
2020-02-05T10:37:00.1954545Z     |
2020-02-05T10:37:00.1954917Z 489 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.1955126Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.1955287Z ...
2020-02-05T10:37:00.1955455Z 540 | / unsigned_arbitrary! {
2020-02-05T10:37:00.1955857Z 541 | |     usize, u8, u16, u32, u64
2020-02-05T10:37:00.1956211Z     | |_- in this macro invocation
2020-02-05T10:37:00.1956362Z 
2020-02-05T10:37:00.3187457Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3187457Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3196893Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:489:17
2020-02-05T10:37:00.3197075Z     |
2020-02-05T10:37:00.3987832Z 489 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3988000Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3988082Z ...
2020-02-05T10:37:00.3988128Z 540 | / unsigned_arbitrary! {
2020-02-05T10:37:00.3988202Z 541 | |     usize, u8, u16, u32, u64
2020-02-05T10:37:00.3988322Z     | |_- in this macro invocation
2020-02-05T10:37:00.3988358Z 
2020-02-05T10:37:00.3988428Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3988428Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3988510Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:489:17
2020-02-05T10:37:00.3988601Z     |
2020-02-05T10:37:00.3988658Z 489 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3988747Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3988804Z ...
2020-02-05T10:37:00.3988868Z 540 | / unsigned_arbitrary! {
2020-02-05T10:37:00.3988956Z 541 | |     usize, u8, u16, u32, u64
2020-02-05T10:37:00.3989091Z     | |_- in this macro invocation
2020-02-05T10:37:00.3989145Z 
2020-02-05T10:37:00.3989196Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3989196Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3989297Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.3989364Z     |
2020-02-05T10:37:00.3989446Z 553 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3989536Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3989593Z ...
2020-02-05T10:37:00.3989655Z 603 | / signed_arbitrary! {
2020-02-05T10:37:00.3989708Z 604 | |     isize, i8, i16, i32, i64
2020-02-05T10:37:00.3989831Z     | |_- in this macro invocation
2020-02-05T10:37:00.3989864Z 
2020-02-05T10:37:00.3989935Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3989935Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3990038Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.3990113Z     |
2020-02-05T10:37:00.3990186Z 553 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3990256Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3990331Z ...
2020-02-05T10:37:00.3990374Z 603 | / signed_arbitrary! {
2020-02-05T10:37:00.3990448Z 604 | |     isize, i8, i16, i32, i64
2020-02-05T10:37:00.3990564Z     | |_- in this macro invocation
2020-02-05T10:37:00.3990597Z 
2020-02-05T10:37:00.3990666Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3990666Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3990745Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.3990832Z     |
2020-02-05T10:37:00.3990887Z 553 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3991200Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3991283Z ...
2020-02-05T10:37:00.3991327Z 603 | / signed_arbitrary! {
2020-02-05T10:37:00.3991400Z 604 | |     isize, i8, i16, i32, i64
2020-02-05T10:37:00.3991517Z     | |_- in this macro invocation
2020-02-05T10:37:00.3991550Z 
2020-02-05T10:37:00.3991599Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3991599Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3991696Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.3991786Z     |
2020-02-05T10:37:00.3991841Z 553 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.3991934Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.3991990Z ...
2020-02-05T10:37:00.3992052Z 603 | / signed_arbitrary! {
2020-02-05T10:37:00.3992105Z 604 | |     isize, i8, i16, i32, i64
2020-02-05T10:37:00.3992233Z     | |_- in this macro invocation
2020-02-05T10:37:00.3992285Z 
2020-02-05T10:37:00.3992335Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.3992335Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.4131301Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.4131646Z     |
2020-02-05T10:37:00.4131828Z 553 |                   pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.4132206Z     |                   ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.4132388Z ...
2020-02-05T10:37:00.4132532Z 603 | / signed_arbitrary! {
2020-02-05T10:37:00.4132872Z 604 | |     isize, i8, i16, i32, i64
2020-02-05T10:37:00.4133168Z     | |_- in this macro invocation
2020-02-05T10:37:00.4133286Z 
2020-02-05T10:37:00.4133455Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.4133455Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.4133646Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.4133837Z     |
2020-02-05T10:37:00.4134001Z 553 |                 pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.4134162Z     |                 ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.4134322Z ...
2020-02-05T10:37:00.4134457Z 612 |         signed_shrinker!(i32);
2020-02-05T10:37:00.4134753Z 
2020-02-05T10:37:00.4134912Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.4134912Z error[E0449]: unnecessary visibility qualifier
2020-02-05T10:37:00.4135097Z    --> C:\Users\VssAdministrator\.cargo\registry\src\github.com-1ecc6299db9ec823\quickcheck-0.4.1\src\arbitrary.rs:553:17
2020-02-05T10:37:00.4135254Z     |
2020-02-05T10:37:00.4135419Z 553 |                 pub fn new(x: $ty) -> Box<Iterator<Item=$ty>> {
2020-02-05T10:37:00.4135582Z     |                 ^^^ `pub` not permitted here because it's implied
2020-02-05T10:37:00.4135764Z ...
2020-02-05T10:37:00.4135922Z 623 |         signed_shrinker!(i64);
2020-02-05T10:37:00.4136215Z 
2020-02-05T10:37:00.6826306Z error: aborting due to 12 previous errors
2020-02-05T10:37:00.6872284Z 
2020-02-05T10:37:00.6873329Z For more information about this error, try `rustc --explain E0449`.
2020-02-05T10:37:00.6873329Z For more information about this error, try `rustc --explain E0449`.
2020-02-05T10:37:00.6925166Z error: could not compile `quickcheck`.
2020-02-05T10:37:00.7051161Z warning: build failed, waiting for other jobs to finish...
2020-02-05T10:37:00.9461224Z error: build failed
2020-02-05T10:37:00.9494788Z thread 'main' panicked at 'tests failed for https://github.com/BurntSushi/xsv', src\tools\cargotest\main.rs:88:9
2020-02-05T10:37:00.9515350Z 
2020-02-05T10:37:00.9515481Z 
2020-02-05T10:37:00.9515981Z command did not execute successfully: "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\cargotest.exe" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "D:\\a\\1\\s\\build\\ct"
2020-02-05T10:37:00.9516239Z expected success, got: exit code: 101
---
2020-02-05T10:37:01.2676602Z   local time: Wed Feb  5 10:37:01 CUT 2020
2020-02-05T10:37:01.6075298Z   network time: Wed, 05 Feb 2020 10:37:01 GMT
2020-02-05T10:37:01.6089315Z == end clock drift check ==
2020-02-05T10:37:01.7524428Z 
2020-02-05T10:37:02.0537341Z ##[error]Bash exited with code '1'.
2020-02-05T10:37:02.1047819Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-05T10:37:02.2166523Z ==============================================================================
2020-02-05T10:37:02.2166701Z Task         : Get sources
2020-02-05T10:37:02.2166794Z 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)

bors · 2020-02-05T10:38:56Z

💔 Test failed - checks-azure

ForNeVeR and others added 15 commits February 2, 2020 15:08

Strip unnecessary subexpression

b0a9e94

It became unnecessary since a06baa5 reformatted the file.

Pull out a special case in merge_from_succ.

d62b6f2

This is a small perf win.

Clean up E0264, E0267 and E0268 explanations

11eee61

parse_ty_common: use enums instead of bools.

c0b7b41

parser: merge fn grammars wrt. bodies & headers

b2c6eeb

also refactor `FnKind` and `visit_assoc_item` visitors

lowering: add recursion_limit = 256

67c29ed

#![recursion_limit = "X"]: note current crate name.

01dd376

Fix issue number of capacity method

df7d9f3

Rollup merge of rust-lang#68762 - ForNeVeR:patch-1, r=alexcrichton

8f83635

Strip unnecessary subexpression It became unnecessary since a06baa5 reformatted the file. The comment is currently a bit misleading.

Rollup merge of rust-lang#68790 - nnethercote:improve-merge_from_succ…

eac6e90

…, r=nikomatsakis Improve `merge_from_succ` A couple of small performance wins. r? @nikomatsakis

Rollup merge of rust-lang#68832 - GuillaumeGomez:clean-up-3-err-codes…

5bcd27c

…, r=estebank Clean up E0264, E0267 and E0268 explanations r? @Dylan-DPC

Rollup merge of rust-lang#68840 - Centril:rec-lim-curr-crate, r=estebank

64ffb4f

On suggesting `#![recursion_limit = "X"]`, note current crate name This would have saved me much confusion e.g. when reading the log output in rust-lang#68788 (comment). r? @estebank

Rollup merge of rust-lang#68851 - JohnTitor:fix-issue-number, r=Centril

68d523a

Fix issue number of `capacity` method Follow-up of rust-lang#68558 (comment) r? @alexcrichton

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 5, 2020

Centril added the rollup A PR which is a rollup label Feb 5, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 5, 2020

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 Feb 5, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 5, 2020

Centril closed this Feb 5, 2020

Centril deleted the rollup-cofz94u branch February 5, 2020 10:45

Centril mentioned this pull request Feb 5, 2020

parse: towards unified fn grammar #68788

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #68854

Rollup of 6 pull requests #68854

Centril commented Feb 5, 2020

Centril commented Feb 5, 2020

bors commented Feb 5, 2020

bors commented Feb 5, 2020

rust-highfive commented Feb 5, 2020

bors commented Feb 5, 2020

Centril commented Feb 5, 2020

bors commented Feb 5, 2020

rust-highfive commented Feb 5, 2020

bors commented Feb 5, 2020

Rollup of 6 pull requests #68854

Rollup of 6 pull requests #68854

Conversation

Centril commented Feb 5, 2020

Centril commented Feb 5, 2020

bors commented Feb 5, 2020

bors commented Feb 5, 2020

rust-highfive commented Feb 5, 2020

bors commented Feb 5, 2020

Centril commented Feb 5, 2020

bors commented Feb 5, 2020

rust-highfive commented Feb 5, 2020

bors commented Feb 5, 2020