Improve docs/clean up negative overlap functions #112605
Merged
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
rustbot
added
S-waiting-on-review
compiler-errors
commented
Jun 14, 2023
| @@ -365,7 +365,9 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { | |||
| } | |||
|
|
|||
| if !candidate_set.ambiguous && no_candidates_apply { | |||
| let trait_ref = stack.obligation.predicate.skip_binder().trait_ref; | |||
| let trait_ref = self.infcx.resolve_vars_if_possible( | |||
There was a problem hiding this comment.
Added this because I removed .map(|p| infcx.resolve_vars_if_possible(p)) from above. It's clearer to be resolving when the trait ref is being used, IMO.
| #[instrument(level = "debug", skip(infcx))] | ||
| fn negative_impl_exists<'tcx>( | ||
| infcx: &InferCtxt<'tcx>, | ||
| o: &PredicateObligation<'tcx>, | ||
| body_def_id: DefId, | ||
| ) -> bool { | ||
| if resolve_negative_obligation(infcx.fork(), o, body_def_id) { |
There was a problem hiding this comment.
This is redundant with the elaborate below.
| !equate(&infcx, impl_env, subject1, subject2, obligations, impl1_def_id) | ||
| } | ||
|
|
||
| fn equate<'tcx>( |
There was a problem hiding this comment.
I inlined this function because it didn't seem clear why this needed to be a separate method, especially because we invert the bool that it returns.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 14, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#112584 (loongarch64-none*: Remove environment component from llvm target) - rust-lang#112600 (Introduce a `Stable` trait to translate MIR to SMIR) - rust-lang#112605 (Improve docs/clean up negative overlap functions) - rust-lang#112611 (Error on unconstrained lifetime in RPITIT) - rust-lang#112612 (Fix explicit-outlives-requirements lint span) - rust-lang#112613 (Fix rustdoc-gui tests on Windows) - rust-lang#112620 (Fix small typo) 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.
Clean up some functions in ways that should not affect behavior, change some names to be clearer (
negative_implandimplicit_negativeare not really clear imo), and add some documentation examples.r? @spastorino