]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #37681 - nrc:crate-metadata, r=@alexcrichton
authorbors <bors@rust-lang.org>
Wed, 23 Nov 2016 03:54:10 +0000 (21:54 -0600)
committerGitHub <noreply@github.com>
Wed, 23 Nov 2016 03:54:10 +0000 (21:54 -0600)
add --crate-type metadata

r? @alexcrichton

1  2 
src/librustc/middle/cstore.rs
src/librustc/middle/weak_lang_items.rs
src/librustc/session/config.rs
src/librustc_driver/driver.rs
src/librustc_metadata/creader.rs
src/librustc_metadata/cstore.rs
src/librustc_metadata/cstore_impl.rs
src/librustc_metadata/decoder.rs
src/librustc_metadata/locator.rs
src/librustc_trans/back/link.rs
src/librustc_trans/base.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 407166203de87b4f12dc263e39a439f21cc6ce5e,cf8240db1958a2936d382cc457a8ce32d944c8dc..ead933384b96d9b4e18bbfbe807270c406e83c02
@@@ -28,11 -28,9 +28,10 @@@ use rustc::mir::Mir
  use rustc::util::nodemap::{NodeSet, DefIdMap};
  use rustc_back::PanicStrategy;
  
- use std::path::PathBuf;
  use syntax::ast;
  use syntax::attr;
 -use syntax::parse::{token, new_parser_from_source_str};
 +use syntax::parse::new_parser_from_source_str;
 +use syntax::symbol::Symbol;
  use syntax_pos::mk_sp;
  use rustc::hir::svh::Svh;
  use rustc_back::target::Target;
Simple merge
Simple merge
Simple merge
Simple merge