Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 7 pull requests #112003

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.

Sign up for GitHub

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

Closed
wants to merge 20 commits into from
Closed

Rollup of 7 pull requests #112003

Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
548978f
add lib module to `src/tool/compiletest`
onur-ozkan May 9, 2023
c36b209
create new tool rustdoc-gui-test
onur-ozkan May 20, 2023
6a34732
derive `Default` trait for `compiletest::common::Config`
onur-ozkan May 20, 2023
02ea750
add compiletest headers to rustdoc-gui tests
onur-ozkan May 20, 2023
f28a63b
implement and use tools/rustdoc-gui-test in bootstrap
onur-ozkan May 20, 2023
462a96c
[RFC-2011] Expand more expressions
c410-f3r May 25, 2023
b084c52
Generate docs for bootstrap itself
jyn514 May 26, 2023
be44860
fix for `Self` not respecting tuple Ctor privacy
fee1-dead May 5, 2023
e7fa993
do not prefer substs relate during coherence
lcnr May 26, 2023
b6b9611
remove unnecessary `.ok()` calls
lcnr May 26, 2023
39f337a
Make errors from `x doc` less verbose
jyn514 May 26, 2023
c7cec29
add rustdoc-gui-test tool in triagebot.toml
onur-ozkan May 20, 2023
ad77bc8
print const and type errors in braces not square brackets
BoxyUwU May 26, 2023
c71b92f
Rollup merge of #111245 - fee1-dead-contrib:temp-fix-tuple-struct-fie…
compiler-errors May 26, 2023
05f1b00
Rollup merge of #111348 - ozkanonur:remove-hardcoded-rustdoc-flags, r…
compiler-errors May 26, 2023
e6b85ab
Rollup merge of #111928 - c410-f3r:dqewdas, r=eholk
compiler-errors May 26, 2023
a40a67f
Rollup merge of #111976 - jyn514:doc-bootstrap, r=ozkanonur
compiler-errors May 26, 2023
a7d7ad3
Rollup merge of #111977 - jyn514:doc-errors, r=est31
compiler-errors May 26, 2023
a7a33e0
Rollup merge of #111987 - lcnr:alias-relate-coherence, r=BoxyUwU
compiler-errors May 26, 2023
a2f69a4
Rollup merge of #111991 - BoxyUwU:change_error_term_display, r=compil…
compiler-errors May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions compiler/rustc_trait_selection/src/solve/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,21 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {

let mut candidates = Vec::new();
// LHS normalizes-to RHS
candidates.extend(
evaluate_normalizes_to(self, alias_lhs, rhs, direction, Invert::No).ok(),
);
candidates.extend(evaluate_normalizes_to(
self,
alias_lhs,
rhs,
direction,
Invert::No,
));
// RHS normalizes-to RHS
candidates.extend(
evaluate_normalizes_to(self, alias_rhs, lhs, direction, Invert::Yes).ok(),
);
candidates.extend(evaluate_normalizes_to(
self,
alias_rhs,
lhs,
direction,
Invert::Yes,
));
// Relate via substs
let subst_relate_response = self.probe(|ecx| {
let span = tracing::span!(
Expand Down Expand Up @@ -265,10 +273,18 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {

if let Some(merged) = self.try_merge_responses(&candidates) {
Ok(merged)
} else if let Ok(subst_relate_response) = subst_relate_response {
Ok(subst_relate_response)
} else {
self.flounder(&candidates)
// When relating two aliases and we have ambiguity, we prefer
// relating the generic arguments of the aliases over normalizing
// them. This is necessary for inference during typeck.
//
// As this is incomplete, we must not do so during coherence.
match (self.solver_mode(), subst_relate_response) {
(SolverMode::Normal, Ok(response)) => Ok(response),
(SolverMode::Normal, Err(NoSolution)) | (SolverMode::Coherence, _) => {
self.flounder(&candidates)
}
}
}
}
}
Expand Down