diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index aac1c2fc02b..e9fe94cdb4a 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -2456,6 +2456,7 @@ mod tests {
     use super::{Externs, OutputType, OutputTypes};
     use rustc_back::{PanicStrategy, RelroLevel};
     use syntax::symbol::Symbol;
+    use syntax::edition::{Edition, DEFAULT_EDITION};
     use syntax;
 
     fn optgroups() -> getopts::Options {
@@ -3105,7 +3106,7 @@ mod tests {
     fn test_edition_parsing() {
         // test default edition
         let options = super::basic_options();
-        assert!(options.edition == Edition::DEFAULT_EDITION);
+        assert!(options.edition == DEFAULT_EDITION);
 
         let matches = optgroups()
             .parse(&["--edition=2018".to_string()])
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 9fb024fd906..2bd1e72f0eb 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -155,10 +155,10 @@ pub fn run_core(search_paths: SearchPaths,
         actually_rustdoc: true,
         debugging_opts: config::DebuggingOptions {
             force_unstable_if_unmarked,
-            edition,
             ..config::basic_debugging_options()
         },
         error_format,
+        edition,
         ..config::basic_options().clone()
     };
 
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 600e9eaa05f..24fc4224b79 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -80,9 +80,9 @@ pub fn run(input_path: &Path,
         lint_cap: Some(::rustc::lint::Level::Allow),
         actually_rustdoc: true,
         debugging_opts: config::DebuggingOptions {
-            edition,
             ..config::basic_debugging_options()
         },
+        edition,
         ..config::basic_options().clone()
     };
 
@@ -223,9 +223,9 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
         test: as_test_harness,
         unstable_features: UnstableFeatures::from_environment(),
         debugging_opts: config::DebuggingOptions {
-            edition,
             ..config::basic_debugging_options()
         },
+        edition,
         ..config::basic_options().clone()
     };