Skip to content

Commit

Permalink
resolve type variables in the custom type op pathway
Browse files Browse the repository at this point in the history
  • Loading branch information
nikomatsakis committed Aug 23, 2018
1 parent 1ca467d commit 89574a6
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc/traits/query/type_op/custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ fn scrape_region_constraints<'gcx, 'tcx, R>(
infcx.tcx,
region_obligations
.iter()
.map(|(_, r_o)| (r_o.sup_type, r_o.sub_region)),
.map(|(_, r_o)| (r_o.sup_type, r_o.sub_region))
.map(|(ty, r)| (infcx.resolve_type_vars_if_possible(&ty), r)),
&region_constraint_data,
);

Expand Down
61 changes: 61 additions & 0 deletions src/test/ui/issue-53568.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Regression test for an NLL-related ICE (#53568) -- we failed to
// resolve inference variables in "custom type-ops".
//
// compile-pass

#![feature(nll)]
#![allow(dead_code)]

trait Future {
type Item;
}

impl<F, T> Future for F
where F: Fn() -> T
{
type Item = T;
}

trait Connect {}

struct Connector<H> {
handler: H,
}

impl<H, T> Connect for Connector<H>
where
T: 'static,
H: Future<Item = T>
{
}

struct Client<C> {
connector: C,
}

fn build<C>(_connector: C) -> Client<C> {
unimplemented!()
}

fn client<H>(handler: H) -> Client<impl Connect>
where H: Fn() + Copy
{
let connector = Connector {
handler,
};
let client = build(connector);
client
}

fn main() { }

0 comments on commit 89574a6

Please sign in to comment.