nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for duplicates

Browse Source
This commit is contained in:
kadmin 2022-12-20 21:11:19 +00:00
parent b79a9a0900
commit 7c5cb73735
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View File

@ -181,8 +181,11 @@ fn satisfied_from_param_env<'tcx>(
&& ocx.eq(&ObligationCause::dummy(), self.param_env, c, self.ct).is_ok() && ocx.eq(&ObligationCause::dummy(), self.param_env, c, self.ct).is_ok()
&& ocx.select_all_or_error().is_empty() && ocx.select_all_or_error().is_empty()
}) { }) {
self.single_match = self.single_match = match self.single_match {
if self.single_match.is_none() { Some(Ok(c)) } else { Some(Err(())) }; None => Some(Ok(c)),
Some(Ok(o)) if o == c => Some(Ok(c)),
Some(_) => Some(Err(())),
};
ControlFlow::CONTINUE ControlFlow::CONTINUE
} else if let ty::ConstKind::Expr(e) = c.kind() { } else if let ty::ConstKind::Expr(e) = c.kind() {
e.visit_with(self) e.visit_with(self)
@ -207,8 +210,17 @@ fn satisfied_from_param_env<'tcx>(
let b_ct = tcx.expand_abstract_consts(ce); let b_ct = tcx.expand_abstract_consts(ce);
let mut v = Visitor { ct, infcx, param_env, single_match: None }; let mut v = Visitor { ct, infcx, param_env, single_match: None };
let _ = b_ct.visit_with(&mut v); let _ = b_ct.visit_with(&mut v);
if let Some(inner) = v.single_match { if let Some(inner) = v.single_match {
single_match = if single_match.is_none() { Some(inner) } else { Some(Err(())) }; single_match = if let Ok(inner) = inner {
match single_match {
None => Some(Ok(inner)),
Some(Ok(prev)) if prev == inner => Some(Ok(prev)),
Some(_) => Some(Err(())),
}
} else {
Some(Err(()))
};
} }
} }
_ => {} // don't care _ => {} // don't care