Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge rustc_trans_trait into rustc_trans_utils
  • Loading branch information
bjorn3 committed Sep 23, 2017
1 parent 9eeaba1 commit d703552
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 61 deletions.
16 changes: 2 additions & 14 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/librustc_driver/Cargo.toml
Expand Up @@ -33,7 +33,6 @@ rustc_resolve = { path = "../librustc_resolve" }
rustc_save_analysis = { path = "../librustc_save_analysis" }
rustc_trans = { path = "../librustc_trans", optional = true }
rustc_trans_utils = { path = "../librustc_trans_utils" }
rustc_trans_traits = { path = "../librustc_trans_traits" }
rustc_typeck = { path = "../librustc_typeck" }
serialize = { path = "../libserialize" }
syntax = { path = "../libsyntax" }
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/driver.rs
Expand Up @@ -33,7 +33,7 @@ use rustc_resolve::{MakeGlobMap, Resolver};
use rustc_metadata::creader::CrateLoader;
use rustc_metadata::cstore::{self, CStore};
use rustc_trans as trans;
use rustc_trans_traits::TransCrate;
use rustc_trans_utils::trans_crate::TransCrate;
use rustc_typeck as typeck;
use rustc_privacy;
use rustc_plugin::registry::Registry;
Expand Down
9 changes: 4 additions & 5 deletions src/librustc_driver/lib.rs
Expand Up @@ -50,7 +50,6 @@ extern crate rustc_save_analysis;
#[cfg(feature="llvm")]
extern crate rustc_trans;
extern crate rustc_trans_utils;
extern crate rustc_trans_traits;
extern crate rustc_typeck;
extern crate serialize;
#[macro_use]
Expand All @@ -76,7 +75,7 @@ use rustc::middle::cstore::CrateStore;
use rustc_metadata::locator;
use rustc_metadata::cstore::CStore;
use rustc::util::common::{time, ErrorReported};
use rustc_trans_traits::TransCrate;
use rustc_trans_utils::trans_crate::TransCrate;

use serialize::json::ToJson;

Expand Down Expand Up @@ -153,7 +152,7 @@ pub fn run<F>(run_compiler: F) -> isize
}

#[cfg(not(feature="llvm"))]
pub use rustc_trans_traits::MetadataOnlyTransCrate as DefaultTransCrate;
pub use rustc_trans_utils::trans_crate::MetadataOnlyTransCrate as DefaultTransCrate;
#[cfg(feature="llvm")]
pub use rustc_trans::LlvmTransCrate as DefaultTransCrate;

Expand All @@ -162,8 +161,8 @@ mod rustc_trans {
use syntax_pos::symbol::Symbol;
use rustc::session::Session;
use rustc::session::config::PrintRequest;
pub use rustc_trans_traits::MetadataOnlyTransCrate as LlvmTransCrate;
pub use rustc_trans_traits::TranslatedCrate as CrateTranslation;
pub use rustc_trans_utils::trans_crate::MetadataOnlyTransCrate as LlvmTransCrate;
pub use rustc_trans_utils::trans_crate::TranslatedCrate as CrateTranslation;

pub fn init(_sess: &Session) {}
pub fn enable_llvm_debug() {}
Expand Down
1 change: 0 additions & 1 deletion src/librustc_trans/Cargo.toml
Expand Up @@ -27,7 +27,6 @@ rustc_incremental = { path = "../librustc_incremental" }
rustc_llvm = { path = "../librustc_llvm" }
rustc_platform_intrinsics = { path = "../librustc_platform_intrinsics" }
rustc_trans_utils = { path = "../librustc_trans_utils" }
rustc_trans_traits = { path = "../librustc_trans_traits" }
serialize = { path = "../libserialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_trans/lib.rs
Expand Up @@ -50,7 +50,6 @@ extern crate rustc_incremental;
extern crate rustc_llvm as llvm;
extern crate rustc_platform_intrinsics as intrinsics;
extern crate rustc_const_math;
extern crate rustc_trans_traits;
extern crate rustc_trans_utils;
extern crate rustc_demangle;
extern crate jobserver;
Expand Down Expand Up @@ -154,7 +153,7 @@ impl LlvmTransCrate {
}
}

impl rustc_trans_traits::TransCrate for LlvmTransCrate {
impl rustc_trans_utils::trans_crate::TransCrate for LlvmTransCrate {
type MetadataLoader = metadata::LlvmMetadataLoader;
type OngoingCrateTranslation = back::write::OngoingCrateTranslation;
type TranslatedCrate = CrateTranslation;
Expand Down
21 changes: 0 additions & 21 deletions src/librustc_trans_traits/Cargo.toml

This file was deleted.

9 changes: 7 additions & 2 deletions src/librustc_trans_utils/Cargo.toml
Expand Up @@ -10,8 +10,13 @@ crate-type = ["dylib"]
test = false

[dependencies]
ar = "0.3.0"
flate2 = "0.2"
owning_ref = "0.3.3"
log = "0.3"
rustc = { path = "../librustc" }
rustc_incremental = { path = "../librustc_incremental" }

syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
rustc = { path = "../librustc" }
rustc_back = { path = "../librustc_back" }
rustc_incremental = { path = "../librustc_incremental" }
7 changes: 7 additions & 0 deletions src/librustc_trans_utils/lib.rs
Expand Up @@ -29,9 +29,15 @@

#![cfg_attr(stage0, feature(const_fn))]

extern crate ar;
extern crate flate2;
extern crate owning_ref;
#[macro_use]
extern crate log;

#[macro_use]
extern crate rustc;
extern crate rustc_back;
extern crate rustc_incremental;
extern crate syntax;
extern crate syntax_pos;
Expand All @@ -44,6 +50,7 @@ use rustc::util::nodemap::NodeSet;
use syntax::attr;

pub mod link;
pub mod trans_crate;

/// The context provided lists a set of reachable ids as calculated by
/// middle::reachable, but this contains far more ids and symbols than we're
Expand Down
Expand Up @@ -21,17 +21,6 @@

#![feature(box_syntax)]

extern crate ar;
extern crate flate2;
extern crate owning_ref;

extern crate syntax;
#[macro_use]
extern crate rustc;
extern crate rustc_back;
extern crate rustc_incremental;
extern crate rustc_trans_utils;

use std::io::prelude::*;
use std::io::{self, Cursor};
use std::fs::File;
Expand All @@ -53,8 +42,7 @@ use rustc::middle::cstore::MetadataLoader as MetadataLoaderTrait;
use rustc::dep_graph::DepGraph;
use rustc_back::target::Target;
use rustc_incremental::IncrementalHashesMap;
use rustc_trans_utils::find_exported_symbols;
use rustc_trans_utils::link::{build_link_meta, out_filename};
use link::{build_link_meta, out_filename};

pub trait TransCrate {
type MetadataLoader: MetadataLoaderTrait;
Expand Down Expand Up @@ -197,7 +185,7 @@ impl TransCrate for MetadataOnlyTransCrate {
_output_filenames: &OutputFilenames,
) -> Self::OngoingCrateTranslation {
let link_meta = build_link_meta(&incr_hashes_map);
let exported_symbols = find_exported_symbols(tcx, &analysis.reachable);
let exported_symbols = ::find_exported_symbols(tcx, &analysis.reachable);
let (metadata, _hashes) = tcx.encode_metadata(&link_meta, &exported_symbols);

OngoingCrateTranslation {
Expand Down

0 comments on commit d703552

Please sign in to comment.