diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-04-23 01:44:19 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-05-17 23:13:08 +0300 |
| commit | ee5b1e15aa689b801bc7b2f7ee6508549a043f56 (patch) | |
| tree | a2a6b686a62789e96b41fdc9c611c6153b320897 | |
| parent | 90463a6bdcd18c60e18a1cc810fc6453b96f7d54 (diff) | |
| download | rust-ee5b1e15aa689b801bc7b2f7ee6508549a043f56.tar.gz rust-ee5b1e15aa689b801bc7b2f7ee6508549a043f56.zip | |
Move definition of `Edition` from libsyntax to libsyntax_pos
| -rw-r--r-- | src/libsyntax/lib.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax_pos/edition.rs (renamed from src/libsyntax/edition.rs) | 0 | ||||
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 90af3ba51ec..e9817034569 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -22,7 +22,6 @@ #![feature(unicode_internals)] #![feature(rustc_diagnostic_macros)] #![feature(slice_sort_by_cached_key)] -#![feature(non_exhaustive)] #![feature(const_atomic_usize_new)] #![feature(rustc_attrs)] #![feature(str_escape)] @@ -142,7 +141,6 @@ pub mod codemap; #[macro_use] pub mod config; pub mod entry; -pub mod edition; pub mod feature_gate; pub mod fold; pub mod parse; @@ -150,6 +148,7 @@ pub mod ptr; pub mod show_span; pub mod std_inject; pub mod str; +pub use syntax_pos::edition; pub use syntax_pos::symbol; pub mod test; pub mod tokenstream; diff --git a/src/libsyntax/edition.rs b/src/libsyntax_pos/edition.rs index c98b54581f3..c98b54581f3 100644 --- a/src/libsyntax/edition.rs +++ b/src/libsyntax_pos/edition.rs diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index d30d3d78ca5..d2e768dda3c 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -20,6 +20,7 @@ #![feature(const_fn)] #![feature(custom_attribute)] +#![feature(non_exhaustive)] #![feature(optin_builtin_traits)] #![allow(unused_attributes)] #![feature(specialization)] @@ -48,6 +49,7 @@ extern crate serialize as rustc_serialize; // used by deriving extern crate unicode_width; +pub mod edition; pub mod hygiene; pub use hygiene::{Mark, SyntaxContext, ExpnInfo, ExpnFormat, NameAndSpan, CompilerDesugaringKind}; |