diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-17 23:21:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 23:21:18 -0400 |
| commit | 24e8158213338326740b4efed4dc23dd4c2480c4 (patch) | |
| tree | 72cbfdc6cbcd28acead54b688a8ff3c796cb32a1 /src/test | |
| parent | b8c446eab808a16ea6e878171762d5a1a58ac927 (diff) | |
| parent | 6dc21b71cfd8e5246e7953cf64ea5ee6a19ceb3d (diff) | |
| download | rust-24e8158213338326740b4efed4dc23dd4c2480c4.tar.gz rust-24e8158213338326740b4efed4dc23dd4c2480c4.zip | |
Rollup merge of #41310 - eddyb:demand-const-eval, r=nikomatsakis
[on-demand] Turn monomorphic_const_eval into a proper query, not just a cache. The error definitions and reporting logic, alongside with `eval_length` were moved to `librustc`. Both local and cross-crate constant evaluation is on-demand now, but the latter is only used for `enum` discriminants, to replace the manual insertion into the cache which was done when decoding variants. r? @nikomatsakis
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/incremental/hashes/enum_defs.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/incremental/hashes/enum_defs.rs b/src/test/incremental/hashes/enum_defs.rs index 37c6ef58f5e..0f734683b60 100644 --- a/src/test/incremental/hashes/enum_defs.rs +++ b/src/test/incremental/hashes/enum_defs.rs @@ -27,6 +27,7 @@ #![allow(warnings)] #![feature(rustc_attrs)] +#![feature(stmt_expr_attributes)] #![crate_type="rlib"] @@ -125,9 +126,12 @@ enum EnumChangeValueCStyleVariant0 { enum EnumChangeValueCStyleVariant0 { Variant1, - #[rustc_metadata_dirty(cfg="cfail2")] + #[rustc_metadata_clean(cfg="cfail2")] #[rustc_metadata_clean(cfg="cfail3")] - Variant2 = 22, + Variant2 = + #[rustc_metadata_dirty(cfg="cfail2")] + #[rustc_metadata_clean(cfg="cfail3")] + 22, } #[cfg(cfail1)] |