From 7896cff0922cb051e261e0b7cacaf879cd612d96 Mon Sep 17 00:00:00 2001 From: Zyad Hassan <88045115+zhassan-aws@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:00:05 -0700 Subject: [PATCH] Upgrade toolchain to 2024-09-07 (#3504) Relevant upstream PR: https://github.com/rust-lang/rust/pull/128776: The `TreatParams` enum variants were renamed. Resolves #3503 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --- kani-compiler/src/kani_middle/resolve.rs | 3 ++- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kani-compiler/src/kani_middle/resolve.rs b/kani-compiler/src/kani_middle/resolve.rs index b2b00c1e4a40..d2b1fcd06471 100644 --- a/kani-compiler/src/kani_middle/resolve.rs +++ b/kani-compiler/src/kani_middle/resolve.rs @@ -586,7 +586,8 @@ where debug!(?name, ?ty, "resolve_in_primitive"); let internal_ty = rustc_internal::internal(tcx, ty); let simple_ty = - fast_reject::simplify_type(tcx, internal_ty, TreatParams::AsCandidateKey).unwrap(); + fast_reject::simplify_type(tcx, internal_ty, TreatParams::InstantiateWithInfer) + .unwrap(); let impls = tcx.incoherent_impls(simple_ty).unwrap(); // Find the primitive impl. let item = impls diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c01df140e897..871f98b09046 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-09-06" +channel = "nightly-2024-09-07" components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]