syntax: account for CVarArgs being in the argument list. by eddyb · Pull Request #63459 · rust-lang/rust

eddyb · 2019-08-11T05:29:39Z

Fixes#63430 by testing for 1 argument (the CVarArgs itself) instead of 0.

Note that the error has basically been impossible to trigger since the change that caused #63430, so perhaps we need an audit of untested errors.

Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now.

r? @petrochenkov cc @dlrobertson

petrochenkov · 2019-08-11T09:44:52Z

@bors r+ rollup

bors · 2019-08-11T09:44:53Z

📌 Commit 6b11a63 has been approved by petrochenkov

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@ghost

Rollup of 8 pull requests Successful merges: - #61969 (Add #[repr(transparent)] for several types) - #62108 (Use sharded maps for queries) - #63149 (resolve: Populate external modules in more automatic and lazy way) - #63346 (Lint on some incorrect uses of mem::zeroed / mem::uninitialized) - #63433 (Miri shouldn't look at types) - #63440 (rename RUST_CTFE_BACKTRACE to RUSTC_CTFE_BACKTRACE) - #63442 (Add an example to show how to insert item to a sorted vec) - #63459 (syntax: account for CVarArgs being in the argument list.) Failed merges: r? @ghost

dlrobertson · 2019-08-11T17:30:27Z

Good catch @eddyb

bors · 2019-08-12T06:21:16Z

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

eddyb · 2019-08-12T12:55:22Z

@bors r=petrochenkov

bors · 2019-08-12T12:55:24Z

📌 Commit 34dcca2 has been approved by petrochenkov

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@ghost

Rollup of 11 pull requests Successful merges: - #62760 (Deduplicate error messages in `librsctc_mir`) - #62849 (typeck: Prohibit RPIT types that inherit lifetimes) - #63383 (`async fn` lifetime elision tests) - #63421 (Implement Clone, Display for ascii::EscapeDefault) - #63459 (syntax: account for CVarArgs being in the argument list.) - #63475 (Bring back suggestion for splitting `<-` into `< -`) - #63485 (ci: move mirrors to their standalone bucket) - #63486 (Document `From` trait for `BinaryHeap`) - #63488 (improve DiagnosticBuilder docs) - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs) - #63499 (handle elision in async fn correctly) Failed merges: r? @ghost

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@ghost

Rollup of 10 pull requests Successful merges: - #62760 (Deduplicate error messages in `librsctc_mir`) - #62849 (typeck: Prohibit RPIT types that inherit lifetimes) - #63383 (`async fn` lifetime elision tests) - #63421 (Implement Clone, Display for ascii::EscapeDefault) - #63459 (syntax: account for CVarArgs being in the argument list.) - #63475 (Bring back suggestion for splitting `<-` into `< -`) - #63485 (ci: move mirrors to their standalone bucket) - #63486 (Document `From` trait for `BinaryHeap`) - #63488 (improve DiagnosticBuilder docs) - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs) Failed merges: r? @ghost

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@petrochenkov

syntax: account for CVarArgs being in the argument list. Fixesrust-lang#63430 by testing for `1` argument (the `CVarArgs` itself) instead of `0`. Note that the error has basically been impossible to trigger since the change that caused rust-lang#63430, so perhaps we need an audit of untested errors. Also, this check probably belongs in AST validation/HIR lowering, but I'd rather fix it in place for now. r? @petrochenkov cc @dlrobertson

@ghost

Rollup of 17 pull requests Successful merges: - #62760 (Deduplicate error messages in `librsctc_mir`) - #62849 (typeck: Prohibit RPIT types that inherit lifetimes) - #63383 (`async fn` lifetime elision tests) - #63421 (Implement Clone, Display for ascii::EscapeDefault) - #63459 (syntax: account for CVarArgs being in the argument list.) - #63475 (Bring back suggestion for splitting `<-` into `< -`) - #63485 (ci: move mirrors to their standalone bucket) - #63486 (Document `From` trait for `BinaryHeap`) - #63488 (improve DiagnosticBuilder docs) - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs) - #63499 (handle elision in async fn correctly) - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident) - #63508 (Do not ICE when synthesizing spans falling inside unicode chars) - #63511 (ci: add a check for clock drift) - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>) - #63529 (RELEASES.md: ? is one of three Kleene operators) - #63530 (Fix typo in error message.) Failed merges: r? @ghost

@ghost

Rollup of 17 pull requests Successful merges: - #62760 (Deduplicate error messages in `librsctc_mir`) - #62849 (typeck: Prohibit RPIT types that inherit lifetimes) - #63383 (`async fn` lifetime elision tests) - #63421 (Implement Clone, Display for ascii::EscapeDefault) - #63459 (syntax: account for CVarArgs being in the argument list.) - #63475 (Bring back suggestion for splitting `<-` into `< -`) - #63485 (ci: move mirrors to their standalone bucket) - #63486 (Document `From` trait for `BinaryHeap`) - #63488 (improve DiagnosticBuilder docs) - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs) - #63499 (handle elision in async fn correctly) - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident) - #63508 (Do not ICE when synthesizing spans falling inside unicode chars) - #63511 (ci: add a check for clock drift) - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>) - #63529 (RELEASES.md: ? is one of three Kleene operators) - #63530 (Fix typo in error message.) Failed merges: r? @ghost

rust-highfive assigned petrochenkov Aug 11, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 11, 2019

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 Aug 11, 2019

Mark-Simulacrum mentioned this pull request Aug 11, 2019
Rollup of 8 pull requests #63465
Closed

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 Aug 12, 2019

syntax: account for CVarArgs being in the argument list.
34dcca2

eddyb force-pushed the issue-63430 branch from 6b11a63 to 34dcca2Compare August 12, 2019 12:28

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 Aug 12, 2019

eddyb mentioned this pull request Aug 12, 2019
Remove redundancy from the implementation of C variadics. #63492
Merged

Centril mentioned this pull request Aug 12, 2019
Rollup of 6 pull requests #63494
Closed

Centril mentioned this pull request Aug 13, 2019
Rollup of 11 pull requests #63515
Closed

Centril mentioned this pull request Aug 13, 2019
Rollup of 10 pull requests #63517
Closed

Mark-Simulacrum mentioned this pull request Aug 14, 2019
Rollup of 11 pull requests #63540
Closed

Centril mentioned this pull request Aug 14, 2019
Rollup of 16 pull requests #63541
Closed

Centril mentioned this pull request Aug 14, 2019
Rollup of 17 pull requests #63544
Merged

bors merged commit 34dcca2 into rust-lang:masterAug 14, 2019

eddyb deleted the issue-63430 branch August 14, 2019 10:57

Navigation Menu

Uh oh!

Uh oh!

syntax: account for CVarArgs being in the argument list. - #63459

syntax: account for CVarArgs being in the argument list.#63459
bors merged 1 commit into
rust-lang:masterfrom
eddyb:issue-63430

eddyb commented Aug 11, 2019

Uh oh!

petrochenkov commented Aug 11, 2019

Uh oh!

bors commented Aug 11, 2019

Uh oh!

dlrobertson commented Aug 11, 2019

Uh oh!

bors commented Aug 12, 2019

Uh oh!

eddyb commented Aug 12, 2019

Uh oh!

bors commented Aug 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

eddyb commented Aug 11, 2019

Uh oh!

petrochenkov commented Aug 11, 2019

Uh oh!

bors commented Aug 11, 2019

Uh oh!

dlrobertson commented Aug 11, 2019

Uh oh!

bors commented Aug 12, 2019

Uh oh!

eddyb commented Aug 12, 2019

Uh oh!

bors commented Aug 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants