Move is_min_const_fn query to librustc_mir.
#67781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Centril
reviewed
Jan 1, 2020
src/librustc_mir/constness.rs
Outdated
Comment on lines
10
to
22
| pub trait TyCtxtConstExt { | ||
| /// Whether the `def_id` counts as const fn in your current crate, considering all active | ||
| /// feature gates | ||
| pub fn is_const_fn(self, def_id: DefId) -> bool { | ||
| fn is_const_fn(self, def_id: DefId) -> bool; | ||
|
|
||
| /// Whether the `def_id` is an unstable const fn and what feature gate is necessary to enable it | ||
| fn is_unstable_const_fn(self, def_id: DefId) -> Option<Symbol>; | ||
|
|
||
| /// Returns `true` if this function must conform to `min_const_fn` | ||
| fn is_min_const_fn(self, def_id: DefId) -> bool; | ||
| } | ||
|
|
||
| impl<'tcx> TyCtxtConstExt for TyCtxt<'tcx> { |
There was a problem hiding this comment.
I think these can just be free functions.
There was a problem hiding this comment.
Yea that seems better than an extension trait.
Dylan-DPC-zz
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #67886) made this pull request unmergeable. Please resolve the merge conflicts. |
|
r? @oli-obk |
oli-obk
reviewed
Jan 8, 2020
src/librustc_mir/constness.rs
Outdated
| @@ -1,16 +1,28 @@ | |||
| use crate::hir; | |||
There was a problem hiding this comment.
Please move this file to src/librustc_mir/const_eval/fn_queries.rs and reexport the functions in the const_eval module
The only two uses of the associated methods are in librustc_mir and librustdoc. Please tell me if there is a better choice.
|
Rebased with review comments. |
|
@bors r+ rollup Thanks! |
|
📌 Commit c1c09be has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 8, 2020
Move `is_min_const_fn` query to librustc_mir. The only two uses of the associated methods are in `librustc_mir` and `librustdoc`. Please tell me if there is a better choice. cc rust-lang#65031
bors
added a commit
that referenced
this pull request
Jan 8, 2020
Rollup of 10 pull requests Successful merges: - #67774 (Try statx for all linux-gnu target.) - #67781 (Move `is_min_const_fn` query to librustc_mir.) - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs) - #67849 (Add a check for swapped words when we can't find an identifier) - #67875 (Distinguish between private items and hidden items in rustdoc) - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`) - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates) - #67977 (Updates for VxWorks) - #67985 (Remove insignificant notes from CStr documentation) - #68003 (ci: fix wrong shared.sh import for publish_toolstate) Failed merges: - #67820 (Parse the syntax described in RFC 2632) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) r? @ghost
bors
added a commit
that referenced
this pull request
Jan 8, 2020
Rollup of 10 pull requests Successful merges: - #67774 (Try statx for all linux-gnu target.) - #67781 (Move `is_min_const_fn` query to librustc_mir.) - #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs) - #67849 (Add a check for swapped words when we can't find an identifier) - #67875 (Distinguish between private items and hidden items in rustdoc) - #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`) - #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates) - #67977 (Updates for VxWorks) - #67985 (Remove insignificant notes from CStr documentation) - #68003 (ci: fix wrong shared.sh import for publish_toolstate) Failed merges: - #67820 (Parse the syntax described in RFC 2632) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) r? @ghost
JohnTitor
added a commit
to JohnTitor/rust-clippy
that referenced
this pull request
Jan 9, 2020
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Jan 9, 2020
Rustup to rust-lang/rust#67781 changelog: none
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The only two uses of the associated methods are in
librustc_mirandlibrustdoc. Please tell me if there is a better choice.cc #65031