Upgrade verus to use Rust 1.92.0 (#2056)

Updates Verus to use rustc-1.92.0

Author: dschoepe

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.91.0"
+channel = "1.92.0"
 components = [ "rustc", "rust-std", "cargo", "rustfmt", "rustc-dev", "llvm-tools" ]

source/rust_verify/src/boundary_suggestions.rs

@@ -161,7 +161,9 @@ pub(crate) fn build_fn_assume_specification_suggestion<'tcx>(
             "Cannot build specification for unresolved trait item.  Consider an external_trait_specification declaration.",
         ));
     } else if let Some(impl_def_id) = ctxt.tcx.impl_of_assoc(external_def_id) {
-        if let Some(impl_trait) = ctxt.tcx.impl_trait_header(impl_def_id) {
+        let of_trait = ctxt.tcx.impl_opt_trait_ref(impl_def_id).is_some();
+        if of_trait {
+            let impl_trait = ctxt.tcx.impl_trait_header(impl_def_id);
             let trait_ref = impl_trait.trait_ref.skip_binder();
             let self_ty = trait_ref.self_ty().fold_with(&mut region_renamer);
             format!(

source/rust_verify/src/rust_to_vir_base.rs

@@ -11,9 +11,9 @@ use rustc_hir::definitions::DefPath;
 use rustc_hir::{GenericParam, GenericParamKind, Generics, HirId, LifetimeParamKind, QPath, Ty};
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::ty::{
-    AdtDef, BoundVarReplacerDelegate, Clause, ClauseKind, ConstKind, GenericArg, GenericArgKind,
-    GenericParamDefKind, TermKind, TyCtxt, TyKind, TypeFoldable, TypeFolder, TypeSuperFoldable,
-    TypeVisitableExt, TypingMode, ValTreeKind, Value, Visibility,
+    AdtDef, BoundVarIndexKind, BoundVarReplacerDelegate, Clause, ClauseKind, ConstKind, GenericArg,
+    GenericArgKind, GenericParamDefKind, TermKind, TyCtxt, TyKind, TypeFoldable, TypeFolder,
+    TypeSuperFoldable, TypeVisitableExt, TypingMode, ValTreeKind, Value, Visibility,
 };
 use rustc_middle::ty::{TraitPredicate, TypingEnv};
 use rustc_span::Span;
@@ -322,7 +322,9 @@ where
 
     fn fold_ty(&mut self, t: rustc_middle::ty::Ty<'tcx>) -> rustc_middle::ty::Ty<'tcx> {
         match *t.kind() {
-            rustc_middle::ty::Bound(debruijn, bound_ty) if debruijn == self.current_index => {
+            rustc_middle::ty::Bound(BoundVarIndexKind::Bound(debruijn), bound_ty)
+                if debruijn == self.current_index =>
+            {
                 let ty = self.delegate.replace_ty(bound_ty);
                 debug_assert!(!ty.has_vars_bound_above(rustc_middle::ty::INNERMOST));
                 rustc_middle::ty::shift_vars(self.tcx, ty, self.current_index.as_u32())
@@ -335,9 +337,13 @@ where
     fn fold_region(&mut self, r: rustc_middle::ty::Region<'tcx>) -> rustc_middle::ty::Region<'tcx> {
         match r.kind() {
             // NOTE(verus): This is the one change, we replace == with >=
-            rustc_middle::ty::ReBound(debruijn, br) if debruijn >= self.current_index => {
+            rustc_middle::ty::ReBound(BoundVarIndexKind::Bound(debruijn), br)
+                if debruijn >= self.current_index =>
+            {
                 let region = self.delegate.replace_region(br);
-                if let rustc_middle::ty::ReBound(debruijn1, br) = region.kind() {
+                if let rustc_middle::ty::ReBound(BoundVarIndexKind::Bound(debruijn1), br) =
+                    region.kind()
+                {
                     assert_eq!(debruijn1, rustc_middle::ty::INNERMOST);
                     rustc_middle::ty::Region::new_bound(self.tcx, debruijn, br)
                 } else {
@@ -350,7 +356,9 @@ where
 
     fn fold_const(&mut self, ct: rustc_middle::ty::Const<'tcx>) -> rustc_middle::ty::Const<'tcx> {
         match ct.kind() {
-            ConstKind::Bound(debruijn, bound_const) if debruijn == self.current_index => {
+            ConstKind::Bound(BoundVarIndexKind::Bound(debruijn), bound_const)
+                if debruijn == self.current_index =>
+            {
                 let ct = self.delegate.replace_const(bound_const);
                 debug_assert!(!ct.has_vars_bound_above(rustc_middle::ty::INNERMOST));
                 rustc_middle::ty::shift_vars(self.tcx, ct, self.current_index.as_u32())
@@ -1195,7 +1203,7 @@ pub(crate) fn mid_ty_to_vir_ghost<'tcx>(
             let typx = TypX::FnDef(fun, Arc::new(typ_args), resolved);
             (Arc::new(typx), false)
         }
-        TyKind::Dynamic(preds, _, rustc_middle::ty::DynKind::Dyn) => {
+        TyKind::Dynamic(preds, _) => {
             use rustc_middle::ty::ExistentialPredicate;
             if preds.len() != 1 {
                 unsupported_err!(span, "dyn with more that one trait");

source/rust_verify/src/rust_to_vir_expr.rs

@@ -1368,7 +1368,7 @@ pub(crate) fn expr_to_vir_with_adjustments<'tcx>(
 
             let (tyr1, tyr2) = remove_decoration_typs_for_unsizing(bctx.ctxt.tcx, ty1, ty2);
             let op = match (tyr1.kind(), tyr2.kind()) {
-                (_, TyKind::Dynamic(_, _, rustc_middle::ty::DynKind::Dyn)) => Some(UnaryOp::ToDyn),
+                (_, TyKind::Dynamic(_, _)) => Some(UnaryOp::ToDyn),
                 _ => None,
             };
             if let Some(op) = op {

source/rust_verify/src/rust_to_vir_func.rs

@@ -2289,7 +2289,7 @@ pub(crate) fn get_external_def_id<'tcx>(
 
                 let mut types: Vec<Typ> = vec![];
 
-                let trait_ref = tcx.impl_trait_ref(impl_def_id).expect("impl_trait_ref");
+                let trait_ref = tcx.impl_trait_ref(impl_def_id);
 
                 for ty in trait_ref.instantiate(tcx, impl_args).args.types() {
                     types.push(ctxt.mid_ty_to_vir(impl_item_id, sig.span, &ty, false)?);

source/rust_verify/src/rust_to_vir_impl.rs

@@ -95,7 +95,7 @@ fn trait_impl_to_vir<'tcx>(
         return Ok(None);
     }
 
-    let trait_ref = ctxt.tcx.impl_trait_ref(impl_def_id).expect("impl_trait_ref");
+    let trait_ref = ctxt.tcx.impl_trait_ref(impl_def_id);
     let trait_did = trait_ref.skip_binder().def_id;
     let impl_paths = crate::rust_to_vir_base::get_impl_paths(
         ctxt.tcx,
@@ -163,7 +163,7 @@ fn translate_assoc_type<'tcx>(
     trait_typ_args: Typs,
 ) -> Result<AssocTypeImpl, VirErr> {
     let impl_path = ctxt.def_id_to_vir_path(impl_def_id);
-    let trait_ref = ctxt.tcx.impl_trait_ref(impl_def_id).expect("impl_trait_ref");
+    let trait_ref = ctxt.tcx.impl_trait_ref(impl_def_id);
     let ty = ctxt.tcx.type_of(impl_item_id).skip_binder();
     let typ = ctxt.mid_ty_to_vir(impl_item_id, impl_item_span, &ty, false)?;
     let (typ_params, typ_bounds) = crate::rust_to_vir_base::check_generics_bounds_no_polarity(
@@ -589,7 +589,7 @@ pub(crate) fn collect_external_trait_impls<'tcx>(
 
     // Process only the new implementations that could be visible to Verus:
     'impls: for impl_def_id in auto_import_impls {
-        let trait_ref = tcx.impl_trait_ref(&impl_def_id).expect("impl_trait_ref");
+        let trait_ref = tcx.impl_trait_ref(&impl_def_id);
         for arg in trait_ref.skip_binder().args.iter() {
             if !crate::rust_to_vir_base::mid_arg_filter_for_external_impls(
                 ctxt,
@@ -695,7 +695,7 @@ pub(crate) fn collect_external_trait_impls<'tcx>(
 
     for (impl_path, (impl_def_id, funs)) in new_trait_impls.iter() {
         let trait_ref = tcx.impl_trait_ref(impl_def_id);
-        let trait_did = trait_ref.expect("impl_trait_ref").skip_binder().def_id;
+        let trait_did = trait_ref.skip_binder().def_id;
         let trait_path = ctxt.def_id_to_vir_path(trait_did);
         let Some(traitt) = trait_map.get(&trait_path) else {
             continue;

source/rust_verify/src/verifier.rs

@@ -25,6 +25,7 @@ use vir::messages::{
 
 use num_format::{Locale, ToFormattedString};
 use rustc_error_messages::MultiSpan;
+use rustc_index::bit_set::DenseBitSet;
 use rustc_middle::ty::TyCtxt;
 use rustc_span::Span;
 use rustc_span::def_id::LOCAL_CRATE;
@@ -3095,11 +3096,11 @@ impl rustc_driver::Callbacks for VerifierCallbacksEraseMacro {
                 providers.hir_crate = hir_crate;
                 providers.mir_const_qualif = |_, _| rustc_middle::mir::ConstQualifs::default();
                 providers.lint_mod = |_, _| {};
-                providers.check_liveness = |_, _| {};
+                providers.check_liveness = |_, _| DenseBitSet::new_empty(0);
                 providers.check_mod_deathness = |_, _| {};
 
                 providers.mir_borrowck = |tcx, _local_def_id| {
-                    Ok(tcx.arena.alloc(rustc_middle::mir::ConcreteOpaqueTypes(
+                    Ok(tcx.arena.alloc(rustc_middle::mir::DefinitionSiteHiddenTypes(
                         rustc_data_structures::fx::FxIndexMap::default(),
                     )))
                 };
@@ -3109,7 +3110,7 @@ impl rustc_driver::Callbacks for VerifierCallbacksEraseMacro {
                 providers.hir_crate = hir_crate;
                 providers.mir_const_qualif = |_, _| rustc_middle::mir::ConstQualifs::default();
                 providers.lint_mod = |_, _| {};
-                providers.check_liveness = |_, _| {};
+                providers.check_liveness = |_, _| DenseBitSet::new_empty(0);
                 providers.check_mod_deathness = |_, _| {};
 
                 rustc_mir_build_verus::verus_provide(providers);

source/rust_verify_test/tests/regression.rs

@@ -1459,7 +1459,7 @@ test_verify_one_file_with_options! {
         extern "C" { type T; }
 
         trait ToBool { fn to_bool(&self) -> bool; }
-        impl ToBool for Box<T> where { fn to_bool(&self) -> bool { todo!() } }
+        impl ToBool for *const T where { fn to_bool(&self) -> bool { todo!() } }
     } => Ok(())
 }
 

source/rustc_hir_typeck/src/upvar.rs

@@ -1253,9 +1253,10 @@ fn restrict_precision_for_unsafe(
     (place, curr_mode)
 }
 
-/// Truncate projections so that following rules are obeyed by the captured `place`:
+/// Truncate projections so that the following rules are obeyed by the captured `place`:
 /// - No Index projections are captured, since arrays are captured completely.
-/// - No unsafe block is required to capture `place`
+/// - No unsafe block is required to capture `place`.
+///
 /// Returns the truncated place and updated capture mode.
 fn restrict_capture_precision(
     place: Place<'_>,

source/rustc_mir_build/messages.ftl

@@ -322,17 +322,6 @@ mir_build_pointer_pattern = function pointers and raw pointers not derived from
 
 mir_build_privately_uninhabited = pattern `{$witness_1}` is currently uninhabited, but this variant contains private fields which may become inhabited in the future
 
-mir_build_rust_2024_incompatible_pat = {$bad_modifiers ->
-        *[true] binding modifiers{$bad_ref_pats ->
-            *[true] {" "}and reference patterns
-            [false] {""}
-        }
-        [false] reference patterns
-    } may only be written when the default binding mode is `move`{$is_hard_error ->
-        *[true] {""}
-        [false] {" "}in Rust 2024
-    }
-
 mir_build_static_in_pattern = statics cannot be referenced in patterns
     .label = can't be used in patterns
 mir_build_static_in_pattern_def = `static` defined here
@@ -383,6 +372,11 @@ mir_build_union_field_requires_unsafe_unsafe_op_in_unsafe_fn_allowed =
 mir_build_union_pattern = cannot use unions in constant patterns
     .label = can't use a `union` here
 
+mir_build_unreachable_due_to_uninhabited = unreachable {$descr}
+    .label = unreachable {$descr}
+    .label_orig = any code following this expression is unreachable
+    .note = this expression has type `{$ty}`, which is uninhabited
+
 mir_build_unreachable_making_this_unreachable = collectively making this unreachable
 
 mir_build_unreachable_making_this_unreachable_n_more = ...and {$covered_by_many_n_more_count} other patterns collectively make this unreachable