mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove an unnecessary Option

Browse Source
This commit is contained in:
Takayuki Maeda 2022-06-01 17:06:07 +09:00
parent 395a09c3da
commit 8d007aa06d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_trait_selection/src/traits/wf.rs
View File

@ -81,10 +81,17 @@ pub fn trait_obligations<'a, 'tcx>(
body_id: hir::HirId, body_id: hir::HirId,
trait_ref: &ty::TraitRef<'tcx>, trait_ref: &ty::TraitRef<'tcx>,
span: Span, span: Span,
item: Option<&'tcx hir::Item<'tcx>>, item: &'tcx hir::Item<'tcx>,
) -> Vec<traits::PredicateObligation<'tcx>> { ) -> Vec<traits::PredicateObligation<'tcx>> {
let mut wf = let mut wf = WfPredicates {
WfPredicates { infcx, param_env, body_id, span, out: vec![], recursion_depth: 0, item }; infcx,
param_env,
body_id,
span,
out: vec![],
recursion_depth: 0,
item: Some(item),
};
wf.compute_trait_ref(trait_ref, Elaborate::All); wf.compute_trait_ref(trait_ref, Elaborate::All);
debug!(obligations = ?wf.out); debug!(obligations = ?wf.out);
wf.normalize() wf.normalize()

2
compiler/rustc_typeck/src/check/wfcheck.rs
View File

@ -1228,7 +1228,7 @@ fn check_impl<'tcx>(
fcx.body_id, fcx.body_id,
&trait_ref, &trait_ref,
ast_trait_ref.path.span, ast_trait_ref.path.span,
Some(item), item,
); );
debug!(?obligations); debug!(?obligations);
for obligation in obligations { for obligation in obligations {