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

Aggregation of cosmetic changes made during work on REPL PRs: libsyntax #64226

Merged
merged 2 commits into from
Sep 7, 2019
Merged

Aggregation of cosmetic changes made during work on REPL PRs: libsyntax #64226

merged 2 commits into from
Sep 7, 2019

Conversation

alexreg
Copy link
Contributor

@alexreg alexreg commented Sep 6, 2019

Factored out from hacking on rustc for work on the REPL.

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2019
Centril
Centril reviewed Sep 6, 2019
View reviewed changes
src/libsyntax/parse/diagnostics.rs Outdated Show resolved Hide resolved
src/libsyntax/visit.rs Show resolved Hide resolved
src/libsyntax/parse/lexer/tests.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/parser/expr.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/parser/expr.rs Show resolved Hide resolved
src/libsyntax/source_map/tests.rs Outdated Show resolved Hide resolved
src/libsyntax/source_map/tests.rs Outdated Show resolved Hide resolved
src/libsyntax/source_map/tests.rs Outdated Show resolved Hide resolved
src/libsyntax/source_map/tests.rs Outdated Show resolved Hide resolved
src/libsyntax/source_map/tests.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Sep 7, 2019
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the one remaining thing addressed.

src/libsyntax/parse/parser/expr.rs Outdated Show resolved Hide resolved
@alexreg
Copy link
Contributor Author

alexreg commented Sep 7, 2019

@bors r=centril

@bors
Copy link
Contributor

bors commented Sep 7, 2019

📌 Commit 91d0bc2fd087ae22149273397b7f7c1d42d9f392 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 7, 2019
@Centril Centril mentioned this pull request Sep 7, 2019
Closed
@bors
Copy link
Contributor

bors commented Sep 7, 2019

☔ The latest upstream changes (presumably #64246) 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 Sep 7, 2019
@alexreg
Copy link
Contributor Author

alexreg commented Sep 7, 2019

@bors r=centril

@bors
Copy link
Contributor

bors commented Sep 7, 2019

📌 Commit 553a56d 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 7, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 7, 2019
@Centril
Rollup merge of rust-lang#64226 - alexreg:rush-pr-3, r=centril
add04de 
Aggregation of cosmetic changes made during work on REPL PRs: libsyntax

Factored out from hacking on rustc for work on the REPL.

r? @Centril
@Centril Centril mentioned this pull request Sep 7, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 7, 2019
@Centril
Rollup merge of rust-lang#64226 - alexreg:rush-pr-3, r=centril
c530672 
Aggregation of cosmetic changes made during work on REPL PRs: libsyntax

Factored out from hacking on rustc for work on the REPL.

r? @Centril
@Centril Centril mentioned this pull request Sep 7, 2019
Merged
bors added a commit that referenced this pull request Sep 7, 2019
@bors
Auto merge of #64264 - Centril:rollup-w1khzun, r=Centril
43a5ff4 
Rollup of 7 pull requests

Successful merges:

 - #64023 (libstd fuchsia fixes)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64139 (Migrate internal diagnostic registration to macro_rules)
 - #64226 (Aggregation of cosmetic changes made during work on REPL PRs: libsyntax)
 - #64227 (Aggregation of cosmetic changes made during work on REPL PRs: librustc)
 - #64235 (Upgrade env_logger to 0.6)
 - #64258 (compiletest: Match suffixed environments)

Failed merges:

r? @ghost
@bors bors merged commit 553a56d into rust-lang:master Sep 7, 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-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.
4 participants
@alexreg @rust-highfive @bors @Centril