From ee5b1e15aa689b801bc7b2f7ee6508549a043f56 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Mon, 23 Apr 2018 01:44:19 +0300
Subject: [PATCH] Move definition of `Edition` from libsyntax to libsyntax_pos

---
 src/libsyntax/lib.rs                        | 3 +--
 src/{libsyntax => libsyntax_pos}/edition.rs | 0
 src/libsyntax_pos/lib.rs                    | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename src/{libsyntax => libsyntax_pos}/edition.rs (100%)

diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 90af3ba51ecad..e98170345696a 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
similarity index 100%
rename from src/libsyntax/edition.rs
rename to src/libsyntax_pos/edition.rs
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
index d30d3d78ca540..d2e768dda3c82 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};