update to 6/6

Author: Carolyn Zech

cprover_bindings/src/irep/irep_id.rs

@@ -887,7 +887,7 @@ impl ToString for IrepId {
 }
 
 impl IrepId {
-    pub fn to_string_cow(&self) -> Cow<str> {
+    pub fn to_string_cow(&self) -> Cow<'_, str> {
         match self.to_owned_string() {
             Some(owned) => Cow::Owned(owned),
             None => Cow::Borrowed(self.to_static_string()),

kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs

@@ -519,7 +519,7 @@ impl GotocCtx<'_> {
                 .index_by_increasing_offset()
                 .map(|idx| {
                     let field_ty = layout.field(self, idx).ty;
-                    if idx == *discriminant_field {
+                    if idx == (*discriminant_field).as_usize() {
                         Expr::int_constant(0, self.codegen_ty(field_ty))
                     } else {
                         self.codegen_operand_stable(&operands[idx])

kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs

@@ -914,7 +914,7 @@ impl<'tcx> GotocCtx<'tcx> {
                     pretty_name,
                     type_and_layout,
                     "DirectFields".into(),
-                    Some(*discriminant_field),
+                    Some((*discriminant_field).as_usize()),
                 ),
             };
             let mut fields = vec![direct_fields];
@@ -1277,7 +1277,7 @@ impl<'tcx> GotocCtx<'tcx> {
                 // Contrary to coroutines, currently enums have only one field (the discriminant), the rest are in the variants:
                 assert!(layout.fields.count() <= 1);
                 // Contrary to coroutines, the discriminant is the first (and only) field for enums:
-                assert_eq!(*tag_field, 0);
+                assert_eq!((*tag_field).as_usize(), 0);
                 match tag_encoding {
                     TagEncoding::Direct => {
                         self.ensure_struct(self.ty_mangled_name(ty), pretty_name, |gcx, name| {

kani-compiler/src/kani_middle/provide.rs

@@ -28,15 +28,15 @@ fn should_override(args: &Arguments) -> bool {
 
 /// Returns the optimized code for the external function associated with `def_id` by
 /// running rustc's optimization passes followed by Kani-specific passes.
-fn run_mir_passes_extern(tcx: TyCtxt, def_id: DefId) -> &Body {
+fn run_mir_passes_extern(tcx: TyCtxt<'_>, def_id: DefId) -> &Body<'_> {
     tracing::debug!(?def_id, "run_mir_passes_extern");
     let body = (rustc_interface::DEFAULT_QUERY_PROVIDERS.extern_queries.optimized_mir)(tcx, def_id);
     run_kani_mir_passes(tcx, def_id, body)
 }
 
 /// Returns the optimized code for the local function associated with `def_id` by
 /// running rustc's optimization passes followed by Kani-specific passes.
-fn run_mir_passes(tcx: TyCtxt, def_id: LocalDefId) -> &Body {
+fn run_mir_passes(tcx: TyCtxt<'_>, def_id: LocalDefId) -> &Body<'_> {
     tracing::debug!(?def_id, "run_mir_passes");
     let body = (rustc_interface::DEFAULT_QUERY_PROVIDERS.optimized_mir)(tcx, def_id);
     run_kani_mir_passes(tcx, def_id.to_def_id(), body)

library/kani_macros/src/sysroot/contracts/helpers.rs

@@ -10,7 +10,7 @@ use syn::spanned::Spanned;
 use syn::{Attribute, Expr, ExprBlock, Local, LocalInit, PatIdent, Stmt, parse_quote};
 
 /// If an explicit return type was provided it is returned, otherwise `()`.
-pub fn return_type_to_type(return_type: &syn::ReturnType) -> Cow<syn::Type> {
+pub fn return_type_to_type(return_type: &syn::ReturnType) -> Cow<'_, syn::Type> {
     match return_type {
         syn::ReturnType::Default => Cow::Owned(syn::Type::Tuple(syn::TypeTuple {
             paren_token: syn::token::Paren::default(),

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2025-06-05"
+channel = "nightly-2025-06-06"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]