diff options
| author | bors <bors@rust-lang.org> | 2018-03-09 03:59:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-09 03:59:42 +0000 |
| commit | 2079a084df08c38eb4dbfc5c8de5c0245170c3d9 (patch) | |
| tree | 0fcabcc7de8c86c92497c331b5be41f45f79a579 /src/libsyntax/lib.rs | |
| parent | 604d4ce7577b07b73d115c94fbd8007c1d9c9335 (diff) | |
| parent | b65b171f4433eb14b317c877ac84e4455caec837 (diff) | |
| download | rust-2079a084df08c38eb4dbfc5c8de5c0245170c3d9.tar.gz rust-2079a084df08c38eb4dbfc5c8de5c0245170c3d9.zip | |
Auto merge of #48860 - Manishearth:rollup, r=Manishearth
Rollup of 5 pull requests - Successful merges: #48527, #48588, #48801, #48856, #48857 - Failed merges:
Diffstat (limited to 'src/libsyntax/lib.rs')
| -rw-r--r-- | src/libsyntax/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 14e39b5af42..50e94e5cba7 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -23,6 +23,7 @@ #![feature(unicode)] #![feature(rustc_diagnostic_macros)] #![feature(match_default_bindings)] +#![feature(non_exhaustive)] #![feature(i128_type)] #![feature(const_atomic_usize_new)] #![feature(rustc_attrs)] @@ -114,6 +115,7 @@ pub mod codemap; #[macro_use] pub mod config; pub mod entry; +pub mod epoch; pub mod feature_gate; pub mod fold; pub mod parse; |