Skip to content

Commit

Permalink
Update toolchain to nightly-2023-11-21 (model-checking#2890)
Browse files Browse the repository at this point in the history
We got a bit delayed on the nightly, so this PR closes the gap.

The related Rust changes were:
  - rust-lang/rust#117876
  - rust-lang/rust#117688
  • Loading branch information
celinval authored Nov 24, 2023
1 parent 234ca24 commit e8ee04b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ impl<'tcx> GotocCtx<'tcx> {
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
kind: ty::BoundRegionKind::BrEnv,
};
let env_region = ty::Region::new_late_bound(self.tcx, ty::INNERMOST, br);
let env_region = ty::Region::new_bound(self.tcx, ty::INNERMOST, br);
let env_ty = self.tcx.closure_env_ty(def_id, args, env_region).unwrap();

let sig = sig.skip_binder();
Expand Down Expand Up @@ -341,7 +341,7 @@ impl<'tcx> GotocCtx<'tcx> {
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
kind: ty::BoundRegionKind::BrEnv,
};
let env_region = ty::ReLateBound(ty::INNERMOST, br);
let env_region = ty::ReBound(ty::INNERMOST, br);
let env_ty = Ty::new_mut_ref(self.tcx, ty::Region::new_from_kind(self.tcx, env_region), ty);

let pin_did = self.tcx.require_lang_item(LangItem::Pin, None);
Expand Down
5 changes: 3 additions & 2 deletions kani-compiler/src/kani_middle/analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub fn print_stats<'tcx>(tcx: TyCtxt<'tcx>, items: &[InternalMonoItem<'tcx>]) {
},
)
.fold(StatsVisitor::default(), |mut visitor, body| {
visitor.visit_body(&body.body());
visitor.visit_body(&body.body().unwrap());
visitor
});
eprintln!("====== Reachability Analysis Result =======");
Expand All @@ -46,7 +46,8 @@ pub fn print_stats<'tcx>(tcx: TyCtxt<'tcx>, items: &[InternalMonoItem<'tcx>]) {
eprintln!("Statements:\n{}", visitor.stmts);
eprintln!("Expressions:\n{}", visitor.exprs);
eprintln!("-------------------------------------------")
});
})
.unwrap();
}

#[derive(Default)]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2023-11-12"
channel = "nightly-2023-11-21"
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

0 comments on commit e8ee04b

Please sign in to comment.