-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Fast path nitpicks #143307
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
Open
compiler-errors
wants to merge
3
commits into
rust-lang:master
Choose a base branch
from
compiler-errors:fast-path-nitpicks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+31
−24
Open
Fast path nitpicks #143307
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,11 +6,11 @@ | |
use rustc_infer::infer::TyCtxtInferExt; | ||
use rustc_middle::bug; | ||
use rustc_middle::traits::CodegenObligationError; | ||
use rustc_middle::ty::{self, PseudoCanonicalInput, TyCtxt, TypeVisitableExt, Upcast}; | ||
use rustc_middle::ty::{self, PseudoCanonicalInput, TyCtxt, TypeVisitableExt}; | ||
use rustc_trait_selection::error_reporting::InferCtxtErrorExt; | ||
use rustc_trait_selection::traits::{ | ||
ImplSource, Obligation, ObligationCause, ObligationCtxt, ScrubbedTraitError, SelectionContext, | ||
SelectionError, sizedness_fast_path, | ||
SelectionError, | ||
}; | ||
use tracing::debug; | ||
|
||
|
@@ -34,13 +34,6 @@ pub(crate) fn codegen_select_candidate<'tcx>( | |
let (infcx, param_env) = tcx.infer_ctxt().ignoring_regions().build_with_typing_env(typing_env); | ||
let mut selcx = SelectionContext::new(&infcx); | ||
|
||
if sizedness_fast_path(tcx, trait_ref.upcast(tcx)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This function shouldn't ever be reached -- we never do |
||
return Ok(&*tcx.arena.alloc(ImplSource::Builtin( | ||
ty::solve::BuiltinImplSource::Trivial, | ||
Default::default(), | ||
))); | ||
} | ||
|
||
let obligation_cause = ObligationCause::dummy(); | ||
let obligation = Obligation::new(tcx, obligation_cause, param_env, trait_ref); | ||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#![feature(negative_bounds)] | ||
|
||
fn foo<T: !Sized>() {} | ||
|
||
fn main() { | ||
foo::<()>(); | ||
//~^ ERROR the trait bound `(): !Sized` is not satisfied | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
error[E0277]: the trait bound `(): !Sized` is not satisfied | ||
--> $DIR/negative-sized.rs:6:11 | ||
| | ||
LL | foo::<()>(); | ||
| ^^ the trait bound `(): !Sized` is not satisfied | ||
| | ||
note: required by a bound in `foo` | ||
--> $DIR/negative-sized.rs:3:11 | ||
| | ||
LL | fn foo<T: !Sized>() {} | ||
| ^^^^^^ required by this bound in `foo` | ||
|
||
error: aborting due to 1 previous error | ||
|
||
For more information about this error, try `rustc --explain E0277`. |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this has happened multiple times by now 🤔 forgetting the polarity is too damn easy right now 🤔
I can't really think of a good alternative apart from actually splitting
ClauseKind::Trait
andClauseKind::NegTrait
🤔removing the
def_id
etc functions onTraitPredicate
to requiretrait_pred.trait_ref.def_id()
instead feels really cumbersome and not that helpful 🤔 changingClauseKind::Trait
to haveTraitRef
andPolarity
as separate fields so that we always have to use(_, _)
could work but feels really uglyanyways, not part of this PR