8000 Rollup of 7 pull requests by Centril · Pull Request #66997 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 7 pull requests #66997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Dec 3, 2019
Merged

Rollup of 7 pull requests #66997

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cb08677
parse_enum_item -> parse_enum_variant
Centril Nov 30, 2019
ff5fcac
miri: add throw_machine_stop macro
RalfJung Dec 2, 2019
2304c25
Update the minimum external LLVM to 7
cuviper Dec 2, 2019
54b2060
Change linker for x86_64-fortanix-unknown-sgx to rust-lld
parthsane Dec 2, 2019
0be80f2
[const-prop] Fix ICE calculating enum discriminant
wesleywiser Nov 29, 2019
f3fb1c5
Update the `wasi` crate for `wasm32-wasi`
alexcrichton Nov 25, 2019
2ea1833
Use FxHash* from data structures not nodemap
Mark-Simulacrum Nov 12, 2019
b7cd58c
Decouple CguReuseTracker from Session
Mark-Simulacrum Nov 12, 2019
c761ec1
Introduce rustc_session crate
Mark-Simulacrum Nov 12, 2019
984c74a
Move cgu_reuse_tracker to librustc_session
Mark-Simulacrum Nov 12, 2019
4351698
Move duration_to_secs_str to rustc_session
Mark-Simulacrum Nov 12, 2019
433e546
Move Level to rustc_session
Mark-Simulacrum Nov 12, 2019
526ee51
Move Lint to rustc_session
Mark-Simulacrum Nov 12, 2019
f03d8f3
Move early lint declarations to librustc_session
Mark-Simulacrum Nov 12, 2019
285144a
Move NativeLibraryKind to rustc_session
Mark-Simulacrum Nov 14, 2019
72c67be
Re-export Client from rustc_data_structures::jobserver
Mark-Simulacrum Nov 20, 2019
f2a8aed
Directly use types from libsyntax::ast
Mark-Simulacrum Nov 20, 2019
e810b7e
Remove dead cfg method
Mark-Simulacrum Nov 29, 2019
2731075
Duplicate CrateConfig into Session
Mark-Simulacrum Nov 29, 2019
817d1ae
Move BufferedEarlyLint to librustc_session
Mark-Simulacrum Nov 29, 2019
52d4d47
Move ParseSess to librustc_session
Mark-Simulacrum Nov 29, 2019
cc2c33a
Move Session to librustc_session
Mark-Simulacrum Nov 29, 2019
42c4ae0
Deduplicate CrateConfig
Mark-Simulacrum Nov 29, 2019
68fb218
Fix UI tests for new locations
Mark-Simulacrum Dec 1, 2019
1b83dcf
Rollup merge of #66750 - alexcrichton:update-wasi, r=sfackler
Centril Dec 3, 2019
b6602d2
Rollup merge of #66878 - Mark-Simulacrum:sess-decouple, r=Centril
Centril Dec 3, 2019
d4b6235
Rollup merge of #66903 - Centril:parse-enum-variant, r=estebank
Centril Dec 3, 2019
71d1286
Rollup merge of #66951 - RalfJung:miri-machine-stop, r=oli-obk
Centril Dec 3, 2019
69f1323
Rollup merge of #66957 - parthsane:pvs/ftx_lld_linker, r=alexcrichton
Centril Dec 3, 2019
ded9885
Rollup merge of #66960 - wesleywiser:fix_66787_take2, r=oli-obk,RalfJung
Centril Dec 3, 2019
8dcb532
Rollup merge of #66973 - cuviper:min-llvm7, r=alexcrichton
Centril Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
Prev Previous commit
Next Next commit
Directly use types from libsyntax::ast
  • Loading branch information
@Mark-Simulacrum
Mark-Simulacrum committed Dec 3, 2019
commit f2a8aed380e347f1e5ec6d88fef4ec14d2261e18
9 changes: 4 additions & 5 deletions src/librustc/session/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ use rustc_feature::UnstableFeatures;
use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelroLevel};
use rustc_target::spec::{Target, TargetTriple};

use syntax;
use syntax::ast;
use syntax::ast::CrateConfig;
use syntax::source_map::{FileName, FilePathMapping};
use syntax::edition::{Edition, EDITION_NAME_LIST, DEFAULT_EDITION};
use syntax::symbol::{sym, Symbol};
Expand Down Expand Up @@ -1535,7 +1534,7 @@ pub const fn default_lib_output() -> CrateType {
CrateType::Rlib
}

pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
pub fn default_configuration(sess: &Session) -> CrateConfig {
let end = &sess.target.target.target_endian;
let arch = &sess.target.target.arch;
let wordsz = &sess.target.target.target_pointer_width;
Expand Down Expand Up @@ -1607,13 +1606,13 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
/// Converts the crate `cfg!` configuration from `String` to `Symbol`.
/// `rustc_interface::interface::Config` accepts this in the compiler configuration,
/// but the symbol interner is not yet set up then, so we must convert it later.
pub fn to_crate_config(cfg: FxHashSet<(String, Option<String>)>) -> ast::CrateConfig {
pub fn to_crate_config(cfg: FxHashSet<(String, Option<String>)>) -> CrateConfig {
cfg.into_iter()
.map(|(a, b)| (Symbol::intern(&a), b.map(|b| Symbol::intern(&b))))
.collect()
}

pub fn build_configuration(sess: &Session, mut user_cfg: ast::CrateConfig) -> ast::CrateConfig {
pub fn build_configuration(sess: &Session, mut user_cfg: CrateConfig) -> CrateConfig {
// Combine the configuration requested by the session (command line) with
// some default and generated configuration items.
let default_cfg = default_configuration(sess);
Expand Down
0