mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix breakage in rustdoc

Browse source
This commit is contained in:
Sean Griffin 2018-02-27 12:09:40 -07:00
parent e9eb1a6adc
commit a6d85332f4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/clean/auto_trait.rs
View file

@ -681,12 +681,17 @@ impl<'a, 'tcx, 'rcx> AutoTraitFinder<'a, 'tcx, 'rcx> {
computed_preds.extend(user_computed_preds.iter().cloned()); computed_preds.extend(user_computed_preds.iter().cloned());
let normalized_preds = let normalized_preds =
traits::elaborate_predicates(tcx, computed_preds.clone().into_iter().collect()); traits::elaborate_predicates(tcx, computed_preds.clone().into_iter().collect());
new_env = ty::ParamEnv::new(tcx.mk_predicates(normalized_preds), param_env.reveal); new_env = ty::ParamEnv::new(
tcx.mk_predicates(normalized_preds),
param_env.reveal,
ty::UniverseIndex::ROOT,
);
} }
let final_user_env = ty::ParamEnv::new( let final_user_env = ty::ParamEnv::new(
tcx.mk_predicates(user_computed_preds.into_iter()), tcx.mk_predicates(user_computed_preds.into_iter()),
user_env.reveal, user_env.reveal,
ty::UniverseIndex::ROOT,
); );
debug!( debug!(
"evaluate_nested_obligations(ty_did={:?}, trait_did={:?}): succeeded with '{:?}' \ "evaluate_nested_obligations(ty_did={:?}, trait_did={:?}): succeeded with '{:?}' \