Skip to content

Commit

Permalink
Update toolchain to 2024-10-17 (#3610)
Browse files Browse the repository at this point in the history
Update Rust toolchain to 2024-10-17.

The changes required are due to the merging of `AnalysisDomain` into
`Analysis`: rust-lang/rust#131481

Resolves #3608 

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.
  • Loading branch information
zhassan-aws authored Oct 17, 2024
1 parent 041beda commit bff1daa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions kani-compiler/src/kani_middle/points_to/points_to_analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use rustc_middle::{
},
ty::{Instance, InstanceKind, List, ParamEnv, TyCtxt, TyKind},
};
use rustc_mir_dataflow::{Analysis, AnalysisDomain, Forward, JoinSemiLattice};
use rustc_mir_dataflow::{Analysis, Forward, JoinSemiLattice};
use rustc_smir::rustc_internal;
use rustc_span::{DUMMY_SP, source_map::Spanned};
use stable_mir::mir::{Body as StableBody, mono::Instance as StableInstance};
Expand Down Expand Up @@ -114,7 +114,7 @@ impl<'a, 'tcx> PointsToAnalysis<'a, 'tcx> {
}
}

impl<'tcx> AnalysisDomain<'tcx> for PointsToAnalysis<'_, 'tcx> {
impl<'tcx> Analysis<'tcx> for PointsToAnalysis<'_, 'tcx> {
/// Dataflow state at each instruction.
type Domain = PointsToGraph<'tcx>;

Expand All @@ -133,9 +133,7 @@ impl<'tcx> AnalysisDomain<'tcx> for PointsToAnalysis<'_, 'tcx> {
fn initialize_start_block(&self, _body: &Body<'tcx>, state: &mut Self::Domain) {
state.join(&self.initial_graph.clone());
}
}

impl<'tcx> Analysis<'tcx> for PointsToAnalysis<'_, 'tcx> {
/// Update current dataflow state based on the information we can infer from the given
/// statement.
fn apply_statement_effect(
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-2024-10-16"
channel = "nightly-2024-10-17"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

0 comments on commit bff1daa

Please sign in to comment.