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

Fix typo in error message. #63530

Merged
merged 2 commits into from
Aug 14, 2019
Merged

Fix typo in error message. #63530

merged 2 commits into from
Aug 14, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Aug 13, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2019
Centril
Centril reviewed Aug 13, 2019
View reviewed changes
src/libsyntax/parse/parser/expr.rs Outdated Show resolved Hide resolved
src/test/ui/issues/issue-13483.stderr Outdated Show resolved Hide resolved
src/test/ui/issues/issue-13483.stderr Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Aug 13, 2019

r=me rollup if you like with ^-- applied :)

@ehuss @Centril
Apply Centril's suggestion
643ddfa 
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
@ehuss
Copy link
Contributor Author

ehuss commented Aug 13, 2019

@bors r=centril rollup

@bors
Copy link
Contributor

bors commented Aug 13, 2019

📌 Commit 643ddfa 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 Aug 13, 2019
@Centril
Copy link
Contributor

Centril commented Aug 13, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Aug 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63530 - ehuss:typo-statemement, r=centril
cd20a2e 
Fix typo in error message.
@Centril Centril mentioned this pull request Aug 14, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63530 - ehuss:typo-statemement, r=centril
a8bb375 
Fix typo in error message.
@Centril Centril mentioned this pull request Aug 14, 2019
Merged
bors added a commit that referenced this pull request Aug 14, 2019
@bors
Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
98282c0 
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
bors added a commit that referenced this pull request Aug 14, 2019
@bors
Auto merge of #63544 - Centril:rollup-qhqfcov, r=Centril
c43d03a 
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
@bors
Copy link
Contributor

bors commented Aug 14, 2019

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

@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 Aug 14, 2019
@bors bors merged commit 643ddfa into rust-lang:master Aug 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@Centril Centril

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

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