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.

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

Aggregation of cosmetic changes made during work on REPL PRs: librustc #64227

Merged
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
@rust-highfive

This comment has been minimized.

src/librustc/hir/lowering.rs Outdated Show resolved Hide resolved
src/librustc/hir/mod.rs Show resolved Hide resolved
src/librustc/ich/hcx.rs Show resolved Hide resolved
src/librustc/mir/interpret/allocation.rs Show resolved Hide resolved
src/librustc/mir/interpret/allocation.rs Show resolved Hide resolved
src/librustc/ty/query/on_disk_cache.rs Outdated Show resolved Hide resolved
src/librustc/ty/query/on_disk_cache.rs Outdated Show resolved Hide resolved
src/librustc/ty/query/on_disk_cache.rs Outdated Show resolved Hide resolved
src/librustc/ty/context.rs Outdated Show resolved Hide resolved
src/librustc/ty/context.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

src/librustc/mir/mod.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Sep 7, 2019

r=me with the 3 remaining comments addressed.

@alexreg
Copy link
Contributor Author

alexreg commented Sep 7, 2019

@bors r=centril p=1

@bors
Copy link
Contributor

bors commented Sep 7, 2019

📌 Commit 30dd1a31784dbeba53aa153867470f576ad3bf32 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
@alexreg
Copy link
Contributor Author

alexreg commented Sep 7, 2019

@bors p=0

@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
Alexander Regueiro and others added 2 commits September 7, 2019 16:27
@alexreg
Copy link
Contributor Author

alexreg commented Sep 7, 2019

@bors r=centril

@bors
Copy link
Contributor

bors commented Sep 7, 2019

📌 Commit fd48ca2 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
Aggregation of cosmetic changes made during work on REPL PRs: librustc

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

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Sep 7, 2019
Aggregation of cosmetic changes made during work on REPL PRs: librustc

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

r? @Centril
bors added a commit that referenced this pull request Sep 7, 2019
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 fd48ca2 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
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants