diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2020-03-24 23:46:47 +0100 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2020-03-26 09:40:51 +0100 |
| commit | fa06cfd25b2f53d01eb92605caac8d39cbb57ab0 (patch) | |
| tree | 5a454818a7f204eb200c9b473cc55eb8c22d0f56 /src/librustc/ty/query | |
| parent | 0e8b59a2f4d006943424de9363421b7e2ed45e89 (diff) | |
| download | rust-fa06cfd25b2f53d01eb92605caac8d39cbb57ab0.tar.gz rust-fa06cfd25b2f53d01eb92605caac8d39cbb57ab0.zip | |
Move generics on QueryCache.
Diffstat (limited to 'src/librustc/ty/query')
| -rw-r--r-- | src/librustc/ty/query/plumbing.rs | 2 | ||||
| -rw-r--r-- | src/librustc/ty/query/profiling_support.rs | 2 | ||||
| -rw-r--r-- | src/librustc/ty/query/stats.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs index fb699c6fae0..8e34aba8a9e 100644 --- a/src/librustc/ty/query/plumbing.rs +++ b/src/librustc/ty/query/plumbing.rs @@ -208,7 +208,7 @@ macro_rules! is_eval_always { macro_rules! query_storage { (<$tcx:tt>[][$K:ty, $V:ty]) => { - <<$K as Key>::CacheSelector as CacheSelector<TyCtxt<$tcx>, $K, $V>>::Cache + <<$K as Key>::CacheSelector as CacheSelector<$K, $V>>::Cache }; (<$tcx:tt>[storage($ty:ty) $($rest:tt)*][$K:ty, $V:ty]) => { $ty diff --git a/src/librustc/ty/query/profiling_support.rs b/src/librustc/ty/query/profiling_support.rs index d7972045d12..e0d3e764dad 100644 --- a/src/librustc/ty/query/profiling_support.rs +++ b/src/librustc/ty/query/profiling_support.rs @@ -163,7 +163,7 @@ pub(super) fn alloc_self_profile_query_strings_for_query_cache<'tcx, C>( query_state: &QueryState<TyCtxt<'tcx>, C>, string_cache: &mut QueryKeyStringCache, ) where - C: QueryCache<TyCtxt<'tcx>>, + C: QueryCache, C::Key: Debug + Clone, { tcx.prof.with_profiler(|profiler| { diff --git a/src/librustc/ty/query/stats.rs b/src/librustc/ty/query/stats.rs index 12e9094fba6..b496bf839ab 100644 --- a/src/librustc/ty/query/stats.rs +++ b/src/librustc/ty/query/stats.rs @@ -38,7 +38,7 @@ struct QueryStats { local_def_id_keys: Option<usize>, } -fn stats<CTX: QueryContext, C: QueryCache<CTX>>( +fn stats<CTX: QueryContext, C: QueryCache>( name: &'static str, map: &QueryState<CTX, C>, ) -> QueryStats { |