diff options
| author | Oliver Schneider <github35764891676564198441@oli-obk.de> | 2018-06-25 18:46:02 +0200 |
|---|---|---|
| committer | Oliver Schneider <github35764891676564198441@oli-obk.de> | 2018-06-28 11:02:31 +0200 |
| commit | 05994779ea953bdbd7fb015e1afffdd91203a1e8 (patch) | |
| tree | f7b6ff546d4ebbc02a5ce5722cb0cbf13714cc6b /src/librustc/ty/query | |
| parent | 6005b0ad2fc1398d7d4f757cc96eb783ee8fc1ac (diff) | |
| download | rust-05994779ea953bdbd7fb015e1afffdd91203a1e8.tar.gz rust-05994779ea953bdbd7fb015e1afffdd91203a1e8.zip | |
Move everything over from `middle::const_val` to `mir::interpret`
Diffstat (limited to 'src/librustc/ty/query')
| -rw-r--r-- | src/librustc/ty/query/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs index 178ee7cf8e9..1095b943836 100644 --- a/src/librustc/ty/query/mod.rs +++ b/src/librustc/ty/query/mod.rs @@ -26,7 +26,7 @@ use middle::resolve_lifetime::{ResolveLifetimes, Region, ObjectLifetimeDefault}; use middle::stability::{self, DeprecationEntry}; use middle::lang_items::{LanguageItems, LangItem}; use middle::exported_symbols::{SymbolExportLevel, ExportedSymbol}; -use middle::const_val::EvalResult; +use mir::interpret::ConstEvalResult; use mir::mono::{CodegenUnit, Stats}; use mir; use mir::interpret::{GlobalId, Allocation, ConstValue}; @@ -230,7 +230,7 @@ define_queries! { <'tcx> /// Results of evaluating const items or constants embedded in /// other items (such as enum variant explicit discriminants). [] fn const_eval: const_eval_dep_node(ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>) - -> EvalResult<'tcx>, + -> ConstEvalResult<'tcx>, /// Converts a constant value to an constant allocation [] fn const_value_to_allocation: const_value_to_allocation( |