diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 1345229f46277..3efb1e8a72300 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -2361,7 +2361,7 @@ pub fn build_session_options_and_crate_config(
             (k, values)
         })
         .collect();
-        
+
 
 
     let crate_name = matches.opt_str("crate-name");
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 80c0911fee1ea..fae07be101780 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -7,9 +7,9 @@ use errors::emitter::ColorConfig;
 use getopts;
 use rustc::lint::Level;
 use rustc::session::early_error;
-use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs, ExternEntry};
+use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
 use rustc::session::config::{nightly_options, build_codegen_options, build_debugging_options,
-                             get_cmd_lint_options};
+                             get_cmd_lint_options, ExternEntry};
 use rustc::session::search_paths::SearchPath;
 use rustc_driver;
 use rustc_target::spec::TargetTriple;