Skip to content

Commit f57247c

Browse files
committed
Ensure that Rusdoc discovers all necessary auto trait bounds
Fixes rust-lang#50159 This commit makes several improvements to AutoTraitFinder: * Call infcx.resolve_type_vars_if_possible before processing new predicates. This ensures that we eliminate inference variables wherever possible. * Process all nested obligations we get from a vtable, not just ones with depth=1. * The 'depth=1' check was a hack to work around issues processing certain predicates. The other changes in this commit allow us to properly process all predicates that we encounter, so the check is no longer necessary, * Ensure that we only display predicates *without* inference variables to the user, and only attempt to unify predicates that *have* an inference variable as their type. Additionally, the internal helper method is_of_param now operates directly on a type, rather than taking a Substs. This allows us to use the 'self_ty' method, rather than directly dealing with Substs.
1 parent b68fc18 commit f57247c

File tree

2 files changed

+82
-17
lines changed

2 files changed

+82
-17
lines changed

src/librustc/traits/auto_trait.rs

+51-17
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,12 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
334334
continue;
335335
}
336336

337-
let result = select.select(&Obligation::new(dummy_cause.clone(), new_env, pred));
337+
// Call infcx.resolve_type_vars_if_possible to see if we can
338+
// get rid of any inference variables.
339+
let obligation = infcx.resolve_type_vars_if_possible(
340+
&Obligation::new(dummy_cause.clone(), new_env, pred)
341+
);
342+
let result = select.select(&obligation);
338343

339344
match &result {
340345
&Ok(Some(ref vtable)) => {
@@ -369,7 +374,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
369374
}
370375
&Ok(None) => {}
371376
&Err(SelectionError::Unimplemented) => {
372-
if self.is_of_param(pred.skip_binder().trait_ref.substs) {
377+
if self.is_of_param(pred.skip_binder().self_ty()) {
373378
already_visited.remove(&pred);
374379
self.add_user_pred(
375380
&mut user_computed_preds,
@@ -631,14 +636,10 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
631636
finished_map
632637
}
633638

634-
pub fn is_of_param(&self, substs: &Substs<'_>) -> bool {
635-
if substs.is_noop() {
636-
return false;
637-
}
638-
639-
return match substs.type_at(0).sty {
639+
pub fn is_of_param(&self, ty: Ty<'_>) -> bool {
640+
return match ty.sty {
640641
ty::Param(_) => true,
641-
ty::Projection(p) => self.is_of_param(p.substs),
642+
ty::Projection(p) => self.is_of_param(p.self_ty()),
642643
_ => false,
643644
};
644645
}
@@ -661,28 +662,61 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
661662
) -> bool {
662663
let dummy_cause = ObligationCause::misc(DUMMY_SP, ast::DUMMY_NODE_ID);
663664

664-
for (obligation, predicate) in nested
665-
.filter(|o| o.recursion_depth == 1)
665+
for (obligation, mut predicate) in nested
666666
.map(|o| (o.clone(), o.predicate.clone()))
667667
{
668668
let is_new_pred =
669669
fresh_preds.insert(self.clean_pred(select.infcx(), predicate.clone()));
670670

671+
// Resolve any inference variables that we can, to help selection succeed
672+
predicate = select.infcx().resolve_type_vars_if_possible(&predicate);
673+
674+
// We only add a predicate as a user-displayable bound if
675+
// it involves a generic parameter, and doesn't contain
676+
// any inference variables.
677+
//
678+
// Displaying a bound involving a concrete type (instead of a generic
679+
// parameter) would be pointless, since it's always true
680+
// (e.g. u8: Copy)
681+
// Displaying an inference variable is impossible, since they're
682+
// an internal compiler detail without a defined visual representation
683+
//
684+
// We check this by calling is_of_param on the relevant types
685+
// from the various possible predicates
671686
match &predicate {
672687
&ty::Predicate::Trait(ref p) => {
673-
let substs = &p.skip_binder().trait_ref.substs;
688+
if self.is_of_param(p.skip_binder().self_ty())
689+
&& !only_projections
690+
&& is_new_pred {
674691

675-
if self.is_of_param(substs) && !only_projections && is_new_pred {
676692
self.add_user_pred(computed_preds, predicate);
677693
}
678694
predicates.push_back(p.clone());
679695
}
680696
&ty::Predicate::Projection(p) => {
681-
// If the projection isn't all type vars, then
682-
// we don't want to add it as a bound
683-
if self.is_of_param(p.skip_binder().projection_ty.substs) && is_new_pred {
697+
debug!("evaluate_nested_obligations: examining projection predicate {:?}",
698+
predicate);
699+
700+
// As described above, we only want to display
701+
// bounds which include a generic parameter but don't include
702+
// an inference variable.
703+
// Additionally, we check if we've seen this predicate before,
704+
// to avoid rendering duplicate bounds to the user.
705+
if self.is_of_param(p.skip_binder().projection_ty.self_ty())
706+
&& !p.ty().skip_binder().is_ty_infer()
707+
&& is_new_pred {
708+
debug!("evaluate_nested_obligations: adding projection predicate\
709+
to computed_preds: {:?}", predicate);
710+
684711
self.add_user_pred(computed_preds, predicate);
685-
} else {
712+
}
713+
714+
// We can only call poly_project_and_unify_type when our predicate's
715+
// Ty is an inference variable - otherwise, there won't be anything to
716+
// unify
717+
if p.ty().skip_binder().is_ty_infer() {
718+
debug!("Projecting and unifying projection predicate {:?}",
719+
predicate);
686720
match poly_project_and_unify_type(select, &obligation.with(p.clone())) {
687721
Err(e) => {
688722
debug!(

src/test/rustdoc/issue-50159.rs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
12+
pub trait Signal {
13+
type Item;
14+
}
15+
16+
pub trait Signal2 {
17+
type Item2;
18+
}
19+
20+
impl<B, C> Signal2 for B where B: Signal<Item = C> {
21+
type Item2 = C;
22+
}
23+
24+
// @has issue_50159/struct.Switch.html
25+
// @has - '//code' 'impl<B> Send for Switch<B> where <B as Signal>::Item: Send'
26+
// @has - '//code' 'impl<B> Sync for Switch<B> where <B as Signal>::Item: Sync'
27+
// @count - '//*[@id="implementations-list"]/*[@class="impl"]' 0
28+
// @count - '//*[@id="synthetic-implementations-list"]/*[@class="impl"]' 2
29+
pub struct Switch<B: Signal> {
30+
pub inner: <B as Signal2>::Item2,
31+
}

0 commit comments

Comments
 (0)