diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-06-09 09:50:51 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-06-26 10:51:08 -0400 |
| commit | 75e3a9c8fd4283ab797b5bef7e2a36eda7853cec (patch) | |
| tree | eb7e8cc76fcb50dda9726c28887993d842a89b24 | |
| parent | e72dc794883d81e08d11d88795dbd12479b98137 (diff) | |
| download | rust-75e3a9c8fd4283ab797b5bef7e2a36eda7853cec.tar.gz rust-75e3a9c8fd4283ab797b5bef7e2a36eda7853cec.zip | |
rename `instantiate_query_result`
| -rw-r--r-- | src/librustc/infer/canonical/query_result.rs | 2 | ||||
| -rw-r--r-- | src/librustc/traits/query/dropck_outlives.rs | 2 | ||||
| -rw-r--r-- | src/librustc/traits/query/normalize.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/infer/canonical/query_result.rs b/src/librustc/infer/canonical/query_result.rs index d61434daf99..b6d8f6ae946 100644 --- a/src/librustc/infer/canonical/query_result.rs +++ b/src/librustc/infer/canonical/query_result.rs @@ -145,7 +145,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> { /// out the [chapter in the rustc guide][c]. /// /// [c]: https://rust-lang-nursery.github.io/rustc-guide/traits/canonicalization.html#processing-the-canonicalized-query-result - pub fn instantiate_query_result<R>( + pub fn instantiate_query_result_and_region_obligations<R>( &self, cause: &ObligationCause<'tcx>, param_env: ty::ParamEnv<'tcx>, diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs index 671809c059a..3bce25b3eff 100644 --- a/src/librustc/traits/query/dropck_outlives.rs +++ b/src/librustc/traits/query/dropck_outlives.rs @@ -53,7 +53,7 @@ impl<'cx, 'gcx, 'tcx> At<'cx, 'gcx, 'tcx> { debug!("c_ty = {:?}", c_ty); match &gcx.dropck_outlives(c_ty) { Ok(result) if result.is_proven() => { - match self.infcx.instantiate_query_result( + match self.infcx.instantiate_query_result_and_region_obligations( self.cause, self.param_env, &orig_values, diff --git a/src/librustc/traits/query/normalize.rs b/src/librustc/traits/query/normalize.rs index 22b47458bce..f7ee67e810b 100644 --- a/src/librustc/traits/query/normalize.rs +++ b/src/librustc/traits/query/normalize.rs @@ -162,7 +162,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for QueryNormalizer<'cx, 'gcx, 'tcx return ty; } - match self.infcx.instantiate_query_result( + match self.infcx.instantiate_query_result_and_region_obligations( self.cause, self.param_env, &orig_values, |