Skip to content

Commit bff1daa

Browse files
authored
Update toolchain to 2024-10-17 (#3610)
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.
1 parent 041beda commit bff1daa

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

kani-compiler/src/kani_middle/points_to/points_to_analysis.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use rustc_middle::{
4040
},
4141
ty::{Instance, InstanceKind, List, ParamEnv, TyCtxt, TyKind},
4242
};
43-
use rustc_mir_dataflow::{Analysis, AnalysisDomain, Forward, JoinSemiLattice};
43+
use rustc_mir_dataflow::{Analysis, Forward, JoinSemiLattice};
4444
use rustc_smir::rustc_internal;
4545
use rustc_span::{DUMMY_SP, source_map::Spanned};
4646
use stable_mir::mir::{Body as StableBody, mono::Instance as StableInstance};
@@ -114,7 +114,7 @@ impl<'a, 'tcx> PointsToAnalysis<'a, 'tcx> {
114114
}
115115
}
116116

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

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

138-
impl<'tcx> Analysis<'tcx> for PointsToAnalysis<'_, 'tcx> {
139137
/// Update current dataflow state based on the information we can infer from the given
140138
/// statement.
141139
fn apply_statement_effect(

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
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-2024-10-16"
5+
channel = "nightly-2024-10-17"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)