diff options
| author | bors <bors@rust-lang.org> | 2018-12-27 14:35:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-27 14:35:58 +0000 |
| commit | f2b92174e3c25e54156efcbdc105a48d50afb6be (patch) | |
| tree | 2fa787b7af7ea3bf9e02c7363cfdb772896102bf /src/test/rustdoc | |
| parent | d174173552cfa031b63e8b1dabbd08943748dea1 (diff) | |
| parent | a375410e1f8f95f13ed096ff937bf3c64f2ff905 (diff) | |
| download | rust-f2b92174e3c25e54156efcbdc105a48d50afb6be.tar.gz rust-f2b92174e3c25e54156efcbdc105a48d50afb6be.zip | |
Auto merge of #56838 - Aaron1011:fix/rustdoc-infer-unify, r=nikomatsakis
Call poly_project_and_unify_type on types that contain inference types Commit f57247c48cb59 (Ensure that Rusdoc discovers all necessary auto trait bounds) added a check to ensure that we only attempt to unify a projection predicatre with inference variables. However, the check it added was too strict - instead of checking that a type *contains* an inference variable (e.g. '&_', 'MyType<_>'), it required the type to *be* an inference variable (i.e. only '_' would match). This commit relaxes the check to use 'ty.has_infer_types', ensuring that we perform unification wherever possible. Fixes #56822
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/issue-56822.rs | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/test/rustdoc/issue-56822.rs b/src/test/rustdoc/issue-56822.rs new file mode 100644 index 00000000000..41aba1a007a --- /dev/null +++ b/src/test/rustdoc/issue-56822.rs @@ -0,0 +1,34 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +struct Wrapper<T>(T); + +trait MyTrait { + type Output; +} + +impl<'a, I, T: 'a> MyTrait for Wrapper<I> + where I: MyTrait<Output=&'a T> +{ + type Output = T; +} + +struct Inner<'a, T>(&'a T); + +impl<'a, T> MyTrait for Inner<'a, T> { + type Output = &'a T; +} + +// @has issue_56822/struct.Parser.html +// @has - '//*[@id="synthetic-implementations-list"]/*[@class="impl"]//*/code' "impl<'a> Send for \ +// Parser<'a>" +pub struct Parser<'a> { + field: <Wrapper<Inner<'a, u8>> as MyTrait>::Output +} |
