Commit ca38733

cjgillotMark-Simulacrum

authored and

committed

Synthetize a trait ref when none is available.

1 parent 9d1fd97 commit ca38733Copy full SHA for ca38733

File tree

2 files changed

+15

-7

lines changed

src
- librustdoc/clean
  - auto_trait.rs
- test/rustdoc
  - fn-bound.rs

2 files changed

+15

-7

lines changed

`‎src/librustdoc/clean/auto_trait.rs`

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,13 +345,13 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {`
`345`	`345`	`fn make_final_bounds(`
`346`	`346`	`&self,`
`347`	`347`	`ty_to_bounds: FxHashMap<Type, FxHashSet<GenericBound>>,`
`348`		`- ty_to_fn: FxHashMap<Type, (Option<PolyTrait>, Option<Type>)>,`
	`348`	`+ ty_to_fn: FxHashMap<Type, (PolyTrait, Option<Type>)>,`
`349`	`349`	`lifetime_to_bounds: FxHashMap<Lifetime, FxHashSet<GenericBound>>,`
`350`	`350`	`) -> Vec<WherePredicate> {`
`351`	`351`	`ty_to_bounds`
`352`	`352`	`.into_iter()`
`353`	`353`	`.flat_map(\|(ty, mut bounds)\| {`
`354`		`- if let Some((Some(ref poly_trait), ref output)) = ty_to_fn.get(&ty) {`
	`354`	`+ if let Some((ref poly_trait, ref output)) = ty_to_fn.get(&ty) {`
`355`	`355`	`let mut new_path = poly_trait.trait_.clone();`
`356`	`356`	`let last_segment = new_path.segments.pop().expect("segments were empty");`
`357`	`357`
`@@ -470,7 +470,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {`
`470`	`470`	`let mut lifetime_to_bounds: FxHashMap<_, FxHashSet<_>> = Default::default();`
`471`	`471`	`let mut ty_to_traits: FxHashMap<Type, FxHashSet<Path>> = Default::default();`
`472`	`472`
`473`		`- let mut ty_to_fn: FxHashMap<Type, (Option<PolyTrait>, Option<Type>)> = Default::default();`
	`473`	`+ let mut ty_to_fn: FxHashMap<Type, (PolyTrait, Option<Type>)> = Default::default();`
`474`	`474`
`475`	`475`	`for p in clean_where_predicates {`
`476`	`476`	`let (orig_p, p) = (p, p.clean(self.cx));`
`@@ -534,8 +534,8 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {`
`534`	`534`	`if is_fn {`
`535`	`535`	`ty_to_fn`
`536`	`536`	`.entry(ty.clone())`
`537`		`- .and_modify(\|e\| *e = (Some(poly_trait.clone()), e.1.clone()))`
`538`		`- .or_insert(((Some(poly_trait.clone())), None));`
	`537`	`+ .and_modify(\|e\| *e = (poly_trait.clone(), e.1.clone()))`
	`538`	`+ .or_insert(((poly_trait.clone()), None));`
`539`	`539`
`540`	`540`	`ty_to_bounds.entry(ty.clone()).or_default();`
`541`	`541`	`} else {`
`@@ -558,7 +558,13 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {`
`558`	`558`	`.and_modify(\|e\| {`
`559`	`559`	`*e = (e.0.clone(), Some(rhs.ty().unwrap().clone()))`
`560`	`560`	`})`
`561`		`- .or_insert((None, Some(rhs.ty().unwrap().clone())));`
	`561`	`+ .or_insert((`
	`562`	`+ PolyTrait {`
	`563`	`+ trait_: trait_.clone(),`
	`564`	`+ generic_params: Vec::new(),`
	`565`	`+ },`
	`566`	`+ Some(rhs.ty().unwrap().clone()),`
	`567`	`+ ));`
`562`	`568`	`continue;`
`563`	`569`	`}`
`564`	`570`

`‎src/test/rustdoc/fn-bound.rs`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,12 @@ pub struct Span<F: Fn(&i32)> {`
`4`	`4`	`inner: Peekable<ConditionalIterator<F>>,`
`5`	`5`	`}`
`6`	`6`
`7`		`-struct ConditionalIterator<F> {`
	`7`	`+pubstruct ConditionalIterator<F> {`
`8`	`8`	`f: F,`
`9`	`9`	`}`
`10`	`10`
	`11`	`+`
	`12`	`+// @has 'fn_bound/struct.ConditionalIterator.html' '//h3[@class="code-header in-band"]' 'impl<F: Fn(&i32)> Iterator for ConditionalIterator<F>'`
`11`	`13`	`impl<F: Fn(&i32)> Iterator for ConditionalIterator<F> {`
`12`	`14`	`type Item = ();`
`13`	`15`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ca38733

File tree

2 files changed

2 files changed

`‎src/librustdoc/clean/auto_trait.rs`

`‎src/test/rustdoc/fn-bound.rs`

0 commit comments