user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1802 - RalfJung:rustup, r=RalfJung

Browse source 
rustup

Cc https://github.com/rust-lang/rust/issues/85397
This commit is contained in:
bors 2021-05-17 07:37:04 +00:00
commit 55664bc8ac
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
benches/helpers/miri_helper.rs
View file

@ -3,7 +3,6 @@ extern crate rustc_hir;
extern crate rustc_interface;
use rustc_driver::Compilation;
use rustc_hir::def_id::LOCAL_CRATE;
use rustc_interface::{interface, Queries};
use crate::test::Bencher;
@ -22,7 +21,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
let (entry_def_id, _) =
tcx.entry_fn(LOCAL_CRATE).expect("no main or start function found");
tcx.entry_fn(()).expect("no main or start function found");
self.bencher.iter(|| {
let config = miri::MiriConfig::default();

2
rust-version
View file

@ -1 +1 @@
c6dd87a6b4a62cf5d2cb6207b1dcea652ea1aa60
3396a383bb1d1fdad8ceeb74f16cf08e0bd62a1b

3
src/bin/miri.rs
View file

@ -16,7 +16,6 @@ use log::debug;
use rustc_driver::Compilation;
use rustc_errors::emitter::{ColorConfig, HumanReadableErrorType};
use rustc_hir::def_id::LOCAL_CRATE;
use rustc_middle::ty::TyCtxt;
use rustc_session::{config::ErrorOutputType, CtfeBacktrace};
@ -34,7 +33,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
init_late_loggers(tcx);
let (entry_def_id, _) = if let Some((entry_def, x)) = tcx.entry_fn(LOCAL_CRATE) {
let (entry_def_id, _) = if let Some((entry_def, x)) = tcx.entry_fn(()) {
(entry_def, x)
} else {
let output_ty = ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(