Skip to content

Commit

Permalink
Rollup merge of #102378 - compiler-errors:issue-102289, r=jackh726
Browse files Browse the repository at this point in the history
Use already resolved `self_ty` in `confirm_fn_pointer_candidate`

Fixes #102289
  • Loading branch information
JohnTitor authored Sep 28, 2022
2 parents bf54cfe + e5776c6 commit ae20288
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
// the signature, as evidenced by how we treat it during projection.
// The safe thing to do here is to liberate it, though, which should
// have no worse effect than skipping the binder here.
let liberated_fn_ty = self.infcx.replace_bound_vars_with_placeholders(obligation.self_ty());
let liberated_fn_ty =
self.infcx.replace_bound_vars_with_placeholders(obligation.predicate.rebind(self_ty));
let output_ty = self
.infcx
.replace_bound_vars_with_placeholders(liberated_fn_ty.fn_sig(self.tcx()).output());
Expand Down
54 changes: 54 additions & 0 deletions src/test/ui/function-pointer/issue-102289.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// check-pass

pub(crate) trait Parser: Sized {
type Output;
fn parse(&mut self, _input: &str) -> Result<(), ()> {
loop {}
}
fn map<F, B>(self, _f: F) -> Map<Self, F>
where
F: FnMut(Self::Output) -> B,
{
todo!()
}
}

pub(crate) struct Chainl1<P, Op>(P, Op);
impl<P, Op> Parser for Chainl1<P, Op>
where
P: Parser,
Op: Parser,
Op::Output: FnOnce(P::Output, P::Output) -> P::Output,
{
type Output = P::Output;
}
pub(crate) fn chainl1<P, Op>(_parser: P, _op: Op) -> Chainl1<P, Op>
where
P: Parser,
Op: Parser,
Op::Output: FnOnce(P::Output, P::Output) -> P::Output,
{
loop {}
}

pub(crate) struct Map<P, F>(P, F);
impl<A, B, P, F> Parser for Map<P, F>
where
P: Parser<Output = A>,
F: FnMut(A) -> B,
{
type Output = B;
}

impl Parser for u32 {
type Output = ();
}

pub fn chainl1_error_consume() {
fn first<T, U>(t: T, _: U) -> T {
t
}
let _ = chainl1(1, 1.map(|_| first)).parse("");
}

fn main() {}

0 comments on commit ae20288

Please sign in to comment.