mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #104822 - spastorino:selctx-new-instead-of-with_query_mode, r=lcnr

Browse Source 
with_query_mode -> new

r? ```@lcnr```
This commit is contained in:
Matthias Krüger 2022-11-24 21:34:57 +01:00 committed by GitHub
commit 1048a85dbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View File

@ -2112,10 +2112,7 @@ fn maybe_report_ambiguity(
}; };
let obligation = obligation.with(self.tcx, trait_ref.to_poly_trait_predicate()); let obligation = obligation.with(self.tcx, trait_ref.to_poly_trait_predicate());
let mut selcx = SelectionContext::with_query_mode( let mut selcx = SelectionContext::new(&self);
&self,
crate::traits::TraitQueryMode::Standard,
);
match selcx.select_from_obligation(&obligation) { match selcx.select_from_obligation(&obligation) {
Ok(None) => { Ok(None) => {
let impls = ambiguity::recompute_applicable_impls(self.infcx, &obligation); let impls = ambiguity::recompute_applicable_impls(self.infcx, &obligation);

6
compiler/rustc_trait_selection/src/traits/query/evaluate_obligation.rs
View File

@ -2,9 +2,7 @@
use crate::infer::canonical::OriginalQueryValues; use crate::infer::canonical::OriginalQueryValues;
use crate::infer::InferCtxt; use crate::infer::InferCtxt;
use crate::traits::{ use crate::traits::{EvaluationResult, OverflowError, PredicateObligation, SelectionContext};
EvaluationResult, OverflowError, PredicateObligation, SelectionContext, TraitQueryMode,
};
pub trait InferCtxtExt<'tcx> { pub trait InferCtxtExt<'tcx> {
fn predicate_may_hold(&self, obligation: &PredicateObligation<'tcx>) -> bool; fn predicate_may_hold(&self, obligation: &PredicateObligation<'tcx>) -> bool;
@ -97,7 +95,7 @@ fn evaluate_obligation_no_overflow(
match self.evaluate_obligation(obligation) { match self.evaluate_obligation(obligation) {
Ok(result) => result, Ok(result) => result,
Err(OverflowError::Canonical) => { Err(OverflowError::Canonical) => {
let mut selcx = SelectionContext::with_query_mode(&self, TraitQueryMode::Standard); let mut selcx = SelectionContext::new(&self);
selcx.evaluate_root_obligation(obligation).unwrap_or_else(|r| match r { selcx.evaluate_root_obligation(obligation).unwrap_or_else(|r| match r {
OverflowError::Canonical => { OverflowError::Canonical => {
span_bug!( span_bug!(