Rename traits_in_crate query to traits
#111870
Merged
+15
−13
Conversation
This file contains hidden or 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
|
r? @b-naber (rustbot has picked a reviewer for you, use r? to override) |
| @@ -1278,7 +1278,7 @@ rustc_queries! { | |||
|
|
|||
| query codegen_select_candidate( | |||
| key: (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>) | |||
| ) -> Result<&'tcx ImplSource<'tcx, ()>, traits::CodegenObligationError> { | |||
| ) -> Result<&'tcx ImplSource<'tcx, ()>, traits_::CodegenObligationError> { | |||
There was a problem hiding this comment.
idk if it's better to call it traits_ or just use crate::traits everywhere here... Or just import all these keys directly.
There was a problem hiding this comment.
Ah, good call. traits_ is likely the worst option here, I'll try crate::traits/just importing items.
There was a problem hiding this comment.
whichever one is better, r=me
|
@bors r=compiler-errors |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 24, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#111861 (Don't ICE on return-type notation when promoting trait preds to associated type bounds) - rust-lang#111864 (Always require closure parameters to be `Sized`) - rust-lang#111870 (Rename `traits_in_crate` query to `traits`) - rust-lang#111880 (Don't ICE when computing PointerLike trait when region vars are in param-env) - rust-lang#111887 (Add regression tests for pretty-printing inherent projections) r? `@ghost` `@rustbot` modify labels: rollup
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.
This can, in fact, be easily avoided.