Depend on getopts from crates.io

rustc_session exports it for other crates to avoid mismatching
crate versions.

diff --git a/Cargo.lock b/Cargo.lock
index e8a7413ff353fb1fb0312c38fe9e68b1da6566c8..73d276d1776489d6200e3b087678500881c15bab 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4201,6 +4201,7 @@ dependencies = [
 name = "rustc_session"
 version = "0.0.0"
 dependencies = [
+ "getopts",
  "log",
  "num_cpus",
  "rustc_ast",

diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index ad2d7b12d4aadea2e03d5770c6d373c25fd05ca4..0e3199975f9becf3d1a6125f8b5be5440851eb7a 100644 (file)
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -8,7 +8,6 @@
 #![feature(nll)]
 #![recursion_limit = "256"]
 
-pub extern crate getopts;
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -35,6 +34,7 @@
 use rustc_serialize::json::{self, ToJson};
 use rustc_session::config::nightly_options;
 use rustc_session::config::{ErrorOutputType, Input, OutputType, PrintRequest};
+use rustc_session::getopts;
 use rustc_session::lint::{Lint, LintId};
 use rustc_session::{config, DiagnosticOutput, Session};
 use rustc_session::{early_error, early_warn};

diff --git a/src/librustc_interface/tests.rs b/src/librustc_interface/tests.rs
index b452ccfe33a522847d480bdbb38d4e68bbd152f0..c75f3b279a258396935b6fd0b17a312bdc972563 100644 (file)
--- a/src/librustc_interface/tests.rs
+++ b/src/librustc_interface/tests.rs
@@ -1,5 +1,3 @@
-extern crate getopts;
-
 use crate::interface::parse_cfgspecs;
 
 use rustc_data_structures::fx::FxHashSet;
@@ -9,6 +7,7 @@
 use rustc_session::config::{rustc_optgroups, ErrorOutputType, ExternLocation, Options, Passes};
 use rustc_session::config::{ExternEntry, LinkerPluginLto, LtoCli, SwitchWithOptPath};
 use rustc_session::config::{Externs, OutputType, OutputTypes, SymbolManglingVersion};
+use rustc_session::getopts;
 use rustc_session::lint::Level;
 use rustc_session::search_paths::SearchPath;
 use rustc_session::{build_session, Session};

diff --git a/src/librustc_session/Cargo.toml b/src/librustc_session/Cargo.toml
index 3895d0f8061c0f7e4cc92227e8eedfdb4b729821..814073bb4f7be06b202f3825e1be1a3a64675422 100644 (file)
--- a/src/librustc_session/Cargo.toml
+++ b/src/librustc_session/Cargo.toml
@@ -9,6 +9,7 @@ name = "rustc_session"
 path = "lib.rs"
 
 [dependencies]
+getopts = "0.2"
 log = "0.4"
 rustc_errors = { path = "../librustc_errors" }
 rustc_feature = { path = "../librustc_feature" }

diff --git a/src/librustc_session/lib.rs b/src/librustc_session/lib.rs
index cc4d525d62887c3a4dbf810978740a6da69a444a..2ff92c46d12514c7b05d8b94f58a56c1c9200da0 100644 (file)
--- a/src/librustc_session/lib.rs
+++ b/src/librustc_session/lib.rs
@@ -1,10 +1,4 @@
 #![feature(crate_visibility_modifier)]
-#![feature(test)]
-
-// Use the test crate here so we depend on getopts through it. This allow tools to link to both
-// librustc_session and libtest.
-extern crate getopts;
-extern crate test as _;
 
 pub mod cgu_reuse_tracker;
 pub mod utils;
@@ -23,3 +17,5 @@
 pub use session::*;
 
 pub mod output;
+
+pub use getopts;

diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 179c5bfacf32ea047d7a1721dabe2e68146c5795..a5a1e20396cafd5f79e8fd4d85f0c7dfadf2f02a 100644 (file)
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -10,6 +10,7 @@
     nightly_options,
 };
 use rustc_session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
+use rustc_session::getopts;
 use rustc_session::lint::Level;
 use rustc_session::search_paths::SearchPath;
 use rustc_span::edition::{Edition, DEFAULT_EDITION};

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 99860a103d78fa573145959ac18286a3157241d9..b0d5a8e58e1201f84c6ff76f2638b1abf6615008 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -15,7 +15,6 @@
 #![recursion_limit = "256"]
 
 extern crate env_logger;
-extern crate getopts;
 extern crate rustc_ast;
 extern crate rustc_ast_pretty;
 extern crate rustc_attr;
@@ -51,6 +50,7 @@
 use std::process;
 
 use rustc_session::config::{make_crate_type_option, ErrorOutputType, RustcOptGroup};
+use rustc_session::getopts;
 use rustc_session::{early_error, early_warn};
 
 #[macro_use]