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

const_evaluatable: consider sub-expressions to be evaluatable #81577

Merged
merged 1 commit into from
Feb 2, 2021

Conversation

BoxyUwU
Copy link
Member

@BoxyUwU BoxyUwU commented Jan 31, 2021

see zulip topic for more info

cc @lcnr
r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2021
@lcnr lcnr added A-const-generics Area: const generics (parameters and arguments) F-generic_const_exprs `#![feature(generic_const_exprs)]` labels Jan 31, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Feb 1, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit f6bab65 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 Feb 1, 2021
@jonas-schievink
Copy link
Contributor

@bors r- failed in #81622 (comment)

@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 Feb 1, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Feb 1, 2021

you need to rebase. I think your previous PR is not in the history of this one, so the call to walk from the other PR now also needs a .root() call.

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 1, 2021

The places that are erroring in that rollup dont seem to have any calls to walk_abstract_const on master branch so I think maybe one of the other PR's added them

@oli-obk
Copy link
Contributor

oli-obk commented Feb 1, 2021

You're right, it conflicts with #79291

@oli-obk
Copy link
Contributor

oli-obk commented Feb 1, 2021

let's wait for the other PR to merge first

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 1, 2021

that PR seems to have been merged so fingers crossed there are no other PR's that use walk_abstract_const lurking around lol

@lcnr
Copy link
Contributor

lcnr commented Feb 1, 2021

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit 7f8530f 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 Feb 1, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2021
…as-schievink

Rollup of 11 pull requests

Successful merges:

 - rust-lang#80629 (Add lint for 2229 migrations)
 - rust-lang#81022 (Add Frames Iterator for Backtrace)
 - rust-lang#81481 (move some tests)
 - rust-lang#81485 (Add some tests for associated-type-bounds issues)
 - rust-lang#81492 (rustdoc: Note why `rustdoc::html::markdown` is public)
 - rust-lang#81577 (const_evaluatable: consider sub-expressions to be evaluatable)
 - rust-lang#81599 (Implement `TrustedLen` for `Fuse<I: TrustedLen>`)
 - rust-lang#81608 (Improve handling of spans around macro result parse errors)
 - rust-lang#81609 (Remove the remains of query categories)
 - rust-lang#81630 (Fix overflowing text on mobile when sidebar is displayed)
 - rust-lang#81631 (Remove unneeded `mut` variable)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit efec2bb into rust-lang:master Feb 2, 2021
@rustbot rustbot added this to the 1.51.0 milestone Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-const-generics Area: const generics (parameters and arguments) F-generic_const_exprs `#![feature(generic_const_exprs)]` 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.

7 participants