diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-10-02 16:50:20 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-10-04 11:02:40 -0400 |
| commit | 21aaaac29b5f0d009a0a136bdf3e6534d9f1c846 (patch) | |
| tree | 729fd197cd5b1195bebb3d35491eba4a2bff4d16 | |
| parent | cdb95b0f215fb3590dc86223712b5bbcf126582f (diff) | |
| download | rust-21aaaac29b5f0d009a0a136bdf3e6534d9f1c846.tar.gz rust-21aaaac29b5f0d009a0a136bdf3e6534d9f1c846.zip | |
remove all occurences of `skolemize`
| -rw-r--r-- | src/librustc/infer/higher_ranked/README.md | 2 | ||||
| -rw-r--r-- | src/librustc/infer/higher_ranked/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc/traits/select.rs | 2 | ||||
| -rw-r--r-- | src/librustc/ty/sty.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/infer/higher_ranked/README.md b/src/librustc/infer/higher_ranked/README.md index c5c07da1ad0..4b7bdaaad6e 100644 --- a/src/librustc/infer/higher_ranked/README.md +++ b/src/librustc/infer/higher_ranked/README.md @@ -159,7 +159,7 @@ Now we compare the return types, which are covariant, and hence we have: fn(&'A T) <: for<'b> fn(&'b T)? -Here we skolemize the bound region in the supertype to yield: +Here we replace the bound region in the supertype with a placeholder to yield: fn(&'A T) <: fn(&'x T)? diff --git a/src/librustc/infer/higher_ranked/mod.rs b/src/librustc/infer/higher_ranked/mod.rs index ba0f8af4f72..655c66812a5 100644 --- a/src/librustc/infer/higher_ranked/mod.rs +++ b/src/librustc/infer/higher_ranked/mod.rs @@ -602,7 +602,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { })) }); - debug!("skolemize_bound_regions(binder={:?}, result={:?}, map={:?})", + debug!("replace_late_bound_regions_with_placeholders(binder={:?}, result={:?}, map={:?})", binder, result, map); diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index eb3b6f28202..c161113bdb3 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.rs @@ -1190,7 +1190,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> { } } - // Check the cache. Note that we skolemize the trait-ref + // Check the cache. Note that we freshen the trait-ref // separately rather than using `stack.fresh_trait_ref` -- // this is because we want the unbound variables to be // replaced with fresh types starting from index 0. diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs index d8dd73da536..6fc144d986e 100644 --- a/src/librustc/ty/sty.rs +++ b/src/librustc/ty/sty.rs @@ -743,7 +743,7 @@ impl<'tcx> PolyExistentialTraitRef<'tcx> { /// Binder is a binder for higher-ranked lifetimes. It is part of the /// compiler's representation for things like `for<'a> Fn(&'a isize)` /// (which would be represented by the type `PolyTraitRef == -/// Binder<TraitRef>`). Note that when we skolemize, instantiate, +/// Binder<TraitRef>`). Note that when we instantiate, /// erase, or otherwise "discharge" these bound regions, we change the /// type from `Binder<T>` to just `T` (see /// e.g. `liberate_late_bound_regions`). |