diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-31 12:07:37 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-03 11:09:02 -0600 |
| commit | d4beecaed36f6c8ba8f73f06d89fd20267887749 (patch) | |
| tree | ea5786dc8d53fea0a48b71d52f56fb2280dfffa0 /src/librustc_codegen_utils | |
| parent | 88e0ff14a81a2122222e32cf7c285f585c516cfd (diff) | |
| download | rust-d4beecaed36f6c8ba8f73f06d89fd20267887749.tar.gz rust-d4beecaed36f6c8ba8f73f06d89fd20267887749.zip | |
Move validate_crate_name to rustc_metadata
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_codegen_utils/lib.rs | 1 | ||||
| -rw-r--r-- | src/librustc_codegen_utils/link.rs | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/librustc_codegen_utils/Cargo.toml b/src/librustc_codegen_utils/Cargo.toml index 30f533285dd..a1f4a323f84 100644 --- a/src/librustc_codegen_utils/Cargo.toml +++ b/src/librustc_codegen_utils/Cargo.toml @@ -20,3 +20,4 @@ rustc_target = { path = "../librustc_target" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_mir = { path = "../librustc_mir" } rustc_incremental = { path = "../librustc_incremental" } +rustc_metadata_utils = { path = "../librustc_metadata_utils" } diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs index f59cf5832fc..3ff2388beea 100644 --- a/src/librustc_codegen_utils/lib.rs +++ b/src/librustc_codegen_utils/lib.rs @@ -37,6 +37,7 @@ extern crate rustc_incremental; extern crate syntax; extern crate syntax_pos; #[macro_use] extern crate rustc_data_structures; +extern crate rustc_metadata_utils; use rustc::ty::TyCtxt; diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs index aabe931d79c..b33482eb868 100644 --- a/src/librustc_codegen_utils/link.rs +++ b/src/librustc_codegen_utils/link.rs @@ -10,11 +10,12 @@ use rustc::session::config::{self, OutputFilenames, Input, OutputType}; use rustc::session::Session; -use rustc::middle::cstore::{self, LinkMeta}; +use rustc::middle::cstore::LinkMeta; use rustc::hir::svh::Svh; use std::path::{Path, PathBuf}; use syntax::{ast, attr}; use syntax_pos::Span; +use rustc_metadata_utils::validate_crate_name; pub fn out_filename(sess: &Session, crate_type: config::CrateType, @@ -61,7 +62,7 @@ pub fn find_crate_name(sess: Option<&Session>, attrs: &[ast::Attribute], input: &Input) -> String { let validate = |s: String, span: Option<Span>| { - cstore::validate_crate_name(sess, &s, span); + validate_crate_name(sess, &s, span); s }; |