From 5b119e85672832e4e66fe6c76e14d09835535171 Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Fri, 21 Jun 2024 13:21:28 -0700 Subject: [PATCH] Upgrade Rust toolchain to nightly-2024-06-21 (#3282) Related change: - https://github.com/rust-lang/rust/pull/126623 Resolves #3275 --- kani-compiler/src/kani_middle/attributes.rs | 4 ++-- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kani-compiler/src/kani_middle/attributes.rs b/kani-compiler/src/kani_middle/attributes.rs index c74f0c744093..b7d8feeee886 100644 --- a/kani-compiler/src/kani_middle/attributes.rs +++ b/kani-compiler/src/kani_middle/attributes.rs @@ -628,7 +628,7 @@ fn parse_modify_values<'a>( std::iter::from_fn(move || { let tree = iter.next()?; let wrong_token_err = - || tcx.sess.psess.dcx.span_err(tree.span(), "Unexpected token. Expected identifier."); + || tcx.sess.dcx().span_err(tree.span(), "Unexpected token. Expected identifier."); let result = match tree { TokenTree::Token(token, _) => { if let TokenKind::Ident(id, _) = &token.kind { @@ -655,7 +655,7 @@ fn parse_modify_values<'a>( match iter.next() { None | Some(comma_tok!()) => (), Some(not_comma) => { - tcx.sess.psess.dcx.span_err( + tcx.sess.dcx().span_err( not_comma.span(), "Unexpected token, expected end of attribute or comma", ); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index ce876507640a..a433fea0af5f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT [toolchain] -channel = "nightly-2024-06-18" +channel = "nightly-2024-06-21" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]