bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #95466 - Dylan-DPC:rollup-g7ddr8y, r=Dylan-DPC

Browse source 
Rollup of 5 pull requests

Successful merges:

 - #95294 (Document Linux kernel handoff in std::io::copy and std::fs::copy)
 - #95443 (Clarify how `src/tools/x` searches for python)
 - #95452 (fix since field version for termination stabilization)
 - #95460 (Spellchecking compiler code)
 - #95461 (Spellchecking some comments)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2022-03-30 07:45:42 +00:00
commit 05142a7e44
57 changed files with 107 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_trait_selection/src/traits/auto_trait.rs
View file

@ -288,7 +288,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
) -> Option<(ty::ParamEnv<'tcx>, ty::ParamEnv<'tcx>)> {
let tcx = infcx.tcx;
// Don't try to proess any nested obligations involving predicates
// Don't try to process any nested obligations involving predicates
// that are already in the `ParamEnv` (modulo regions): we already
// know that they must hold.
for predicate in param_env.caller_bounds() {
@ -683,12 +683,12 @@ impl<'tcx> AutoTraitFinder<'tcx> {
&& is_new_pred
{
debug!(
"evaluate_nested_obligations: adding projection predicate\
"evaluate_nested_obligations: adding projection predicate \
to computed_preds: {:?}",
predicate
);
// Under unusual circumstances, we can end up with a self-refeential
// Under unusual circumstances, we can end up with a self-referential
// projection predicate. For example:
// <T as MyType>::Value == <T as MyType>::Value
// Not only is displaying this to the user pointless,
@ -767,7 +767,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
// We only care about sub-obligations
// when we started out trying to unify
// some inference variables. See the comment above
// for more infomration
// for more information
if p.term().skip_binder().has_infer_types() {
if !self.evaluate_nested_obligations(
ty,
@ -784,7 +784,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
}
Ok(Ok(None)) => {
// It's ok not to make progress when have no inference variables -
// in that case, we were only performing unifcation to check if an
// in that case, we were only performing unification to check if an
// error occurred (which would indicate that it's impossible for our
// type to implement the auto trait).
// However, we should always make progress (either by generating