diff --git a/src/Cargo.lock b/src/Cargo.lock index 87903731f6612376cc33f54d850a23eb1115b94d..0ee46910f7d6ef3991f11b16aa97c6a38c1a15fb 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1889,7 +1889,6 @@ name = "rustc_plugin" version = "0.0.0" dependencies = [ "rustc 0.0.0", - "rustc_back 0.0.0", "rustc_errors 0.0.0", "rustc_metadata 0.0.0", "syntax 0.0.0", diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs index 5ed7b7f75bbfc70e7e42ee2c0721b92fc801e274..e338ee7bd932877b884d78d533e26f14028bd69a 100644 --- a/src/librustc_back/lib.rs +++ b/src/librustc_back/lib.rs @@ -28,10 +28,8 @@ #![feature(box_syntax)] #![feature(const_fn)] -#![feature(libc)] extern crate syntax; -extern crate libc; extern crate rand; extern crate serialize; #[macro_use] extern crate log; @@ -40,7 +38,6 @@ pub mod tempdir; pub mod target; -pub mod dynamic_lib; use std::str::FromStr; diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs index 155097cdbe26c5e452e915afe17bef36c4cfde4d..e1c5cde42eccfd702acfd5028534ffed28dc44b3 100644 --- a/src/librustc_metadata/creader.rs +++ b/src/librustc_metadata/creader.rs @@ -556,7 +556,7 @@ fn load_derive_macros(&mut self, root: &CrateRoot, dylib: Option, span: use std::{env, mem}; use proc_macro::TokenStream; use proc_macro::__internal::Registry; - use rustc_back::dynamic_lib::DynamicLibrary; + use dynamic_lib::DynamicLibrary; use syntax_ext::deriving::custom::ProcMacroDerive; use syntax_ext::proc_macro_impl::{AttrProcMacro, BangProcMacro}; diff --git a/src/librustc_back/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs similarity index 100% rename from src/librustc_back/dynamic_lib.rs rename to src/librustc_metadata/dynamic_lib.rs diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index 20bdfaea0d0bbf0b294b00c4a0c0de510831f7c3..6c1ca36232307f1c75443ae9a13b50863b533944 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -16,12 +16,14 @@ #![feature(box_patterns)] #![feature(conservative_impl_trait)] #![feature(i128_type)] +#![feature(libc)] #![feature(proc_macro_internals)] #![feature(quote)] #![feature(rustc_diagnostic_macros)] #![feature(specialization)] #![feature(rustc_private)] +extern crate libc; #[macro_use] extern crate log; #[macro_use] @@ -54,6 +56,7 @@ pub mod creader; pub mod cstore; +pub mod dynamic_lib; pub mod locator; __build_diagnostic_array! { librustc_metadata, DIAGNOSTICS } diff --git a/src/librustc_plugin/Cargo.toml b/src/librustc_plugin/Cargo.toml index 7f41d0527617a4161634bcf55ef05edaff10b850..d8fa1da1ce219e1a3b66cf94c4043da5a98aac76 100644 --- a/src/librustc_plugin/Cargo.toml +++ b/src/librustc_plugin/Cargo.toml @@ -11,7 +11,6 @@ crate-type = ["dylib"] [dependencies] rustc = { path = "../librustc" } -rustc_back = { path = "../librustc_back" } rustc_metadata = { path = "../librustc_metadata" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs index a2a6d183e9ccc3d795980792c8bdc872ded6f31c..3df56c4e728ca6f29330100205a4632e95481a90 100644 --- a/src/librustc_plugin/lib.rs +++ b/src/librustc_plugin/lib.rs @@ -71,7 +71,6 @@ #[macro_use] extern crate syntax; extern crate rustc; -extern crate rustc_back; extern crate rustc_metadata; extern crate syntax_pos; extern crate rustc_errors as errors; diff --git a/src/librustc_plugin/load.rs b/src/librustc_plugin/load.rs index aba56788928af2c9c332f7c4824bd2c4f8810505..8a4ec03b20efcc74f14efa5b958ccb04dda050a2 100644 --- a/src/librustc_plugin/load.rs +++ b/src/librustc_plugin/load.rs @@ -115,7 +115,7 @@ fn dylink_registrar(&mut self, span: Span, path: PathBuf, symbol: String) -> PluginRegistrarFun { - use rustc_back::dynamic_lib::DynamicLibrary; + use rustc_metadata::dynamic_lib::DynamicLibrary; // Make sure the path contains a / or the linker will search for it. let path = env::current_dir().unwrap().join(&path); diff --git a/src/librustdoc/plugins.rs b/src/librustdoc/plugins.rs index 4fc5159588d86f7512c4fb75fd77b403c0afbace..1a1e60a6945edd2fc26bb7e3c8a7fbe5292aec89 100644 --- a/src/librustdoc/plugins.rs +++ b/src/librustdoc/plugins.rs @@ -16,7 +16,7 @@ use std::string::String; use std::path::PathBuf; -use rustc_back::dynamic_lib as dl; +use rustc_metadata::dynamic_lib as dl; pub type PluginResult = clean::Crate; pub type PluginCallback = fn (clean::Crate) -> PluginResult; diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index ee0d9a7f3e2d23cd9ea92458bdc0697f96281ffd..98369949c02a470aea0ebd40465f442fb3b6ecb3 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -27,7 +27,7 @@ use rustc::session::{self, CompileIncomplete, config}; use rustc::session::config::{OutputType, OutputTypes, Externs}; use rustc::session::search_paths::{SearchPaths, PathKind}; -use rustc_back::dynamic_lib::DynamicLibrary; +use rustc_metadata::dynamic_lib::DynamicLibrary; use rustc_back::tempdir::TempDir; use rustc_driver::{self, driver, Compilation}; use rustc_driver::driver::phase_2_configure_and_expand; diff --git a/src/test/run-make/extern-fn-reachable/main.rs b/src/test/run-make/extern-fn-reachable/main.rs index a1bd1041d145eaa61e3090e4f79979770d0d5df5..27387332c1c1f50b0a7c4f5f8fbb3ff8eba44a3e 100644 --- a/src/test/run-make/extern-fn-reachable/main.rs +++ b/src/test/run-make/extern-fn-reachable/main.rs @@ -10,9 +10,9 @@ #![feature(rustc_private)] -extern crate rustc_back; +extern crate rustc_metadata; -use rustc_back::dynamic_lib::DynamicLibrary; +use rustc_metadata::dynamic_lib::DynamicLibrary; use std::path::Path; pub fn main() { diff --git a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs index 09a2e8ecd876d4c5d074873068896c944a57f75a..7a15a4cb3a2e8ee9d853e475c45287aae93692a4 100644 --- a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs +++ b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs @@ -14,9 +14,9 @@ // do the runtime check that these functions aren't exported. #![allow(private_no_mangle_fns)] -extern crate rustc_back; +extern crate rustc_metadata; -use rustc_back::dynamic_lib::DynamicLibrary; +use rustc_metadata::dynamic_lib::DynamicLibrary; #[no_mangle] pub fn foo() { bar(); }