Skip to content

Commit e8ee04b

Browse files
authored
Update toolchain to nightly-2023-11-21 (#2890)
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
1 parent 234ca24 commit e8ee04b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<'tcx> GotocCtx<'tcx> {
300300
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
301301
kind: ty::BoundRegionKind::BrEnv,
302302
};
303-
let env_region = ty::Region::new_late_bound(self.tcx, ty::INNERMOST, br);
303+
let env_region = ty::Region::new_bound(self.tcx, ty::INNERMOST, br);
304304
let env_ty = self.tcx.closure_env_ty(def_id, args, env_region).unwrap();
305305

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

347347
let pin_did = self.tcx.require_lang_item(LangItem::Pin, None);

kani-compiler/src/kani_middle/analysis.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn print_stats<'tcx>(tcx: TyCtxt<'tcx>, items: &[InternalMonoItem<'tcx>]) {
3535
},
3636
)
3737
.fold(StatsVisitor::default(), |mut visitor, body| {
38-
visitor.visit_body(&body.body());
38+
visitor.visit_body(&body.body().unwrap());
3939
visitor
4040
});
4141
eprintln!("====== Reachability Analysis Result =======");
@@ -46,7 +46,8 @@ pub fn print_stats<'tcx>(tcx: TyCtxt<'tcx>, items: &[InternalMonoItem<'tcx>]) {
4646
eprintln!("Statements:\n{}", visitor.stmts);
4747
eprintln!("Expressions:\n{}", visitor.exprs);
4848
eprintln!("-------------------------------------------")
49-
});
49+
})
50+
.unwrap();
5051
}
5152

5253
#[derive(Default)]

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

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

0 commit comments

Comments
 (0)