From 49710287756b85edb5a0d82a210ab26973aec746 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 16 Oct 2020 09:35:48 +0200 Subject: [PATCH] Rustup to rustc 1.49.0-nightly (dd7fc54eb 2020-10-15) --- rust-toolchain | 2 +- src/archive.rs | 4 ++-- src/common.rs | 2 +- src/debuginfo/mod.rs | 2 +- src/driver/aot.rs | 4 ++-- src/lib.rs | 2 +- src/metadata.rs | 2 +- src/pretty_clif.rs | 4 +--- src/toolchain.rs | 8 ++++---- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index ab4c3c84c96..d9ac9c12a10 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-10-15 +nightly-2020-10-16 diff --git a/src/archive.rs b/src/archive.rs index fe2c2f100ee..6382f8df344 100644 --- a/src/archive.rs +++ b/src/archive.rs @@ -63,9 +63,9 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> { sess, dst: output.to_path_buf(), lib_search_paths: archive_search_paths(sess), - use_gnu_style_archive: sess.target.target.options.archive_format == "gnu", + use_gnu_style_archive: sess.target.options.archive_format == "gnu", // FIXME fix builtin ranlib on macOS - no_builtin_ranlib: sess.target.target.options.is_like_osx, + no_builtin_ranlib: sess.target.options.is_like_osx, src_archives, entries, diff --git a/src/common.rs b/src/common.rs index 0f22f900ca7..13c62add41a 100644 --- a/src/common.rs +++ b/src/common.rs @@ -352,7 +352,7 @@ impl<'tcx, M: Module> layout::HasParamEnv<'tcx> for FunctionCx<'_, 'tcx, M> { impl<'tcx, M: Module> HasTargetSpec for FunctionCx<'_, 'tcx, M> { fn target_spec(&self) -> &Target { - &self.tcx.sess.target.target + &self.tcx.sess.target } } diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs index f33aa6683a7..cbf9522b1d7 100644 --- a/src/debuginfo/mod.rs +++ b/src/debuginfo/mod.rs @@ -50,7 +50,7 @@ impl<'tcx> DebugContext<'tcx> { // TODO: this should be configurable // macOS doesn't seem to support DWARF > 3 // 5 version is required for md5 file hash - version: if tcx.sess.target.target.options.is_like_osx { + version: if tcx.sess.target.options.is_like_osx { 3 } else { // FIXME change to version 5 once the gdb and lldb shipping with the latest debian diff --git a/src/driver/aot.rs b/src/driver/aot.rs index e7595abe178..ff0b994c9a9 100644 --- a/src/driver/aot.rs +++ b/src/driver/aot.rs @@ -320,8 +320,8 @@ fn codegen_global_asm(tcx: TyCtxt<'_>, cgu_name: &str, global_asm: &str) { } if cfg!(not(feature = "inline_asm")) - || tcx.sess.target.target.options.is_like_osx - || tcx.sess.target.target.options.is_like_windows + || tcx.sess.target.options.is_like_osx + || tcx.sess.target.options.is_like_windows { if global_asm.contains("__rust_probestack") { return; diff --git a/src/lib.rs b/src/lib.rs index af359456e69..fd00a2e00a6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -246,7 +246,7 @@ impl CodegenBackend for CraneliftCodegenBackend { } fn target_triple(sess: &Session) -> target_lexicon::Triple { - sess.target.target.llvm_target.parse().unwrap() + sess.target.llvm_target.parse().unwrap() } fn build_isa(sess: &Session, enable_pic: bool) -> Box { diff --git a/src/metadata.rs b/src/metadata.rs index 7ba6ec6d750..04369bf89fd 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -101,7 +101,7 @@ pub(crate) fn write_metadata( product.add_rustc_section( rustc_middle::middle::exported_symbols::metadata_symbol_name(tcx), compressed, - tcx.sess.target.target.options.is_like_osx, + tcx.sess.target.options.is_like_osx, ); metadata diff --git a/src/pretty_clif.rs b/src/pretty_clif.rs index a37a832a231..26407e25bc6 100644 --- a/src/pretty_clif.rs +++ b/src/pretty_clif.rs @@ -226,9 +226,7 @@ pub(crate) fn write_clif_file<'tcx>( .expect("value location ranges") }); - let clif_output_dir = tcx - .output_filenames(LOCAL_CRATE) - .with_extension("clif"); + let clif_output_dir = tcx.output_filenames(LOCAL_CRATE).with_extension("clif"); match std::fs::create_dir(&clif_output_dir) { Ok(()) => {} diff --git a/src/toolchain.rs b/src/toolchain.rs index d1329d5de7e..463afaf7cc5 100644 --- a/src/toolchain.rs +++ b/src/toolchain.rs @@ -91,10 +91,10 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc } else if stem == "lld" || stem == "rust-lld" { - LinkerFlavor::Lld(sess.target.target.options.lld_flavor) + LinkerFlavor::Lld(sess.target.options.lld_flavor) } else { // fall back to the value in the target spec - sess.target.target.linker_flavor + sess.target.linker_flavor }; Some((linker, flavor)) @@ -115,8 +115,8 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { if let Some(ret) = infer_from( sess, - sess.target.target.options.linker.clone().map(PathBuf::from), - Some(sess.target.target.linker_flavor), + sess.target.options.linker.clone().map(PathBuf::from), + Some(sess.target.linker_flavor), ) { return ret; }