Skip to content

Commit 18e657a

Browse files
authored
Upgrade Rust toolchain to nightly-2023-07-01 (rust-lang#2616)
1 parent a27905f commit 18e657a

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

kani-compiler/src/kani_compiler.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ use rustc_hir::definitions::DefPathHash;
3333
use rustc_interface::Config;
3434
use rustc_middle::ty::TyCtxt;
3535
use rustc_session::config::{ErrorOutputType, OutputType};
36+
use rustc_session::EarlyErrorHandler;
3637
use rustc_span::ErrorGuaranteed;
3738
use std::collections::{BTreeMap, HashMap};
3839
use std::fs::File;
@@ -370,6 +371,7 @@ impl Callbacks for KaniCompiler {
370371
/// During the initialization state, we collect the crate harnesses and prepare for codegen.
371372
fn after_analysis<'tcx>(
372373
&mut self,
374+
_handler: &EarlyErrorHandler,
373375
_compiler: &rustc_interface::interface::Compiler,
374376
rustc_queries: &'tcx rustc_interface::Queries<'tcx>,
375377
) -> Compilation {

kani-compiler/src/session.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use rustc_errors::{
99
emitter::Emitter, emitter::HumanReadableErrorType, fallback_fluent_bundle, json::JsonEmitter,
1010
ColorConfig, Diagnostic, TerminalUrl,
1111
};
12+
use rustc_session::config::ErrorOutputType;
13+
use rustc_session::EarlyErrorHandler;
1214
use std::io::IsTerminal;
1315
use std::panic;
1416
use std::str::FromStr;
@@ -71,7 +73,8 @@ pub fn init_session(args: &ArgMatches, json_hook: bool) {
7173
// Initialize the rustc logger using value from RUSTC_LOG. We keep the log control separate
7274
// because we cannot control the RUSTC log format unless if we match the exact tracing
7375
// version used by RUSTC.
74-
rustc_driver::init_rustc_env_logger();
76+
let handler = EarlyErrorHandler::new(ErrorOutputType::default());
77+
rustc_driver::init_rustc_env_logger(&handler);
7578

7679
// Install Kani panic hook.
7780
if json_hook {

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2023-06-25"
5+
channel = "nightly-2023-07-01"
66
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)