Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update toolchain to nightly-2023-11-21 #2890

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Update toolchain to nightly-2023-11-21 #2890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ccea2e
Update toolchain to `nightly-2023-11-21`
celinval Nov 21, 2023
be3e7cd
Update typ.rs
celinval Nov 21, 2023
d678bd7
Update analysis.rs
celinval Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"]
Loading