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

Suppress ty::Float in MIR comments of ty::Const #75731

Merged
merged 1 commit into from
Aug 20, 2020

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Aug 20, 2020

Already covered by MIR constant comments

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2020

📌 Commit 2b3033056897e9bba699a38919a6ecc019d0f92b has been approved by oli-obk

@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 20, 2020
@bors
Copy link
Contributor

bors commented Aug 20, 2020

☔ The latest upstream changes (presumably #75670) 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 20, 2020
@tesuji tesuji force-pushed the mir-cmts-suppress-float-ty-const branch from 2b30330 to c020a30 Compare August 20, 2020 15:33
Already covered by MIR constant comments
@tesuji tesuji force-pushed the mir-cmts-suppress-float-ty-const branch from c020a30 to d97bbd3 Compare August 20, 2020 16:03
@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2020

📌 Commit d97bbd3 has been approved by oli-obk

@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 Aug 20, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2020
Rollup of 8 pull requests

Successful merges:

 - rust-lang#75672 (Move to intra-doc links for task.rs and vec.rs)
 - rust-lang#75702 (Clean up E0759 explanation)
 - rust-lang#75703 (Enable stack-overflow detection on musl for non-main threads)
 - rust-lang#75710 (Fix bad printing of const-eval queries)
 - rust-lang#75716 (Upgrade Emscripten on CI to 1.39.20 )
 - rust-lang#75731 (Suppress ty::Float in MIR comments of ty::Const)
 - rust-lang#75733 (Remove duplicated alloc vec bench push_all_move)
 - rust-lang#75743 (Rename rustc_lexer::TokenKind::Not to Bang)

Failed merges:

r? @ghost
@bors bors merged commit 16b9b90 into rust-lang:master Aug 20, 2020
@tesuji tesuji deleted the mir-cmts-suppress-float-ty-const branch August 20, 2020 23:55
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
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.

5 participants