Formatting and clippy

brownsys · Dec 18, 2024 · 15888c1 · 15888c1
1 parent f832de5
commit 15888c1
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/crates/flowistry_pdg_construction/src/body_cache.rs b/crates/flowistry_pdg_construction/src/body_cache.rs
@@ -222,7 +222,7 @@ pub fn dump_mir_and_borrowck_facts<'tcx>(tcx: TyCtxt<'tcx>) -> (Duration, Durati
     let tc_time = tc_start.elapsed();
     let dump_time = Instant::now();
     let path = intermediate_out_dir(tcx, INTERMEDIATE_ARTIFACT_EXT);
-    encode_to_file(tcx, &path, &bodies);
+    encode_to_file(tcx, path, &bodies);
     (tc_time, dump_time.elapsed())
 }
 
@@ -243,7 +243,7 @@ pub fn local_or_remote_paths(krate: CrateNum, tcx: TyCtxt, ext: &str) -> Vec<Pat
 }
 
 /// Try to load a [`CachedBody`] for this id.
-fn load_body_and_facts<'tcx>(tcx: TyCtxt<'tcx>, krate: CrateNum) -> BodyMap<'tcx> {
+fn load_body_and_facts(tcx: TyCtxt<'_>, krate: CrateNum) -> BodyMap<'_> {
     let paths = local_or_remote_paths(krate, tcx, INTERMEDIATE_ARTIFACT_EXT);
     for path in &paths {
         if !path.exists() {

diff --git a/crates/flowistry_pdg_construction/src/construct.rs b/crates/flowistry_pdg_construction/src/construct.rs
@@ -437,7 +437,7 @@ impl<'tcx> PartialGraph<'tcx> {
                     child_graph
                         .nodes
                         .iter()
-                        .map(move |dest| (ctrl_src.clone(), dest.clone(), edge.clone()))
+                        .map(move |dest| (ctrl_src, *dest, edge))
                 }),
         );
         self.nodes.extend(child_graph.nodes);

diff --git a/crates/paralegal-flow/src/ana/inline_judge.rs b/crates/paralegal-flow/src/ana/inline_judge.rs
@@ -45,9 +45,8 @@ pub enum InlineJudgement {
 impl Display for InlineJudgement {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.as_ref())?;
-        match self {
-            Self::AbstractViaType(reason) => write!(f, "({reason})")?,
-            _ => (),
+        if let Self::AbstractViaType(reason) = self {
+            write!(f, "({reason})")?;
         }
         Ok(())
     }

diff --git a/crates/paralegal-flow/src/ana/mod.rs b/crates/paralegal-flow/src/ana/mod.rs
@@ -236,7 +236,7 @@ impl<'tcx> SPDGGenerator<'tcx> {
 
         let analyzed_spans = analyzed_functions
             .into_iter()
-            .filter_map(|f| {
+            .map(|f| {
                 let body = self.pdg_constructor.body_for_def_id(f);
                 let span = body_span(tcx, body.body());
                 let pspan = src_loc_for_span(span, tcx);
@@ -258,7 +258,7 @@ impl<'tcx> SPDGGenerator<'tcx> {
                     FunctionHandling::Elided
                 };
 
-                Some((f, (pspan, handling)))
+                (f, (pspan, handling))
             })
             .collect::<AnalyzedSpans>();
 

diff --git a/crates/paralegal-flow/tests/control_flow_tests.rs b/crates/paralegal-flow/tests/control_flow_tests.rs
@@ -2,8 +2,6 @@
 #[macro_use]
 extern crate lazy_static;
 
-use std::fs::File;
-
 use paralegal_flow::test_utils::*;
 
 const CRATE_DIR: &str = "tests/control-flow-tests";

diff --git a/crates/paralegal-policy/src/context.rs b/crates/paralegal-policy/src/context.rs
@@ -583,7 +583,7 @@ impl RootContext {
                         self.desc
                             .def_info
                             .iter()
-                            .filter(|(did, _)| self.desc.analyzed_spans.contains_key(&did))
+                            .filter(|(did, _)| self.desc.analyzed_spans.contains_key(did))
                             .map(|(_, i)| (&i.src_info, matches!(i.kind, DefKind::Type)))
                     })
                     .into_iter()

diff --git a/crates/paralegal-policy/src/test_utils.rs b/crates/paralegal-policy/src/test_utils.rs
@@ -29,7 +29,11 @@ pub fn get_callsite_or_datasink_node<'a>(
         .unwrap()
 }
 
-pub fn get_callsite_node<'a>(ctx: &'a RootContext, controller: Endpoint, name: &'a str) -> NodeCluster {
+pub fn get_callsite_node<'a>(
+    ctx: &'a RootContext,
+    controller: Endpoint,
+    name: &'a str,
+) -> NodeCluster {
     let name = Identifier::new_intern(name);
     let ctrl = &ctx.desc().controllers[&controller];
     let inner = ctrl

diff --git a/crates/paralegal-policy/tests/helpers/mod.rs b/crates/paralegal-policy/tests/helpers/mod.rs
@@ -11,7 +11,7 @@ use std::{
 use anyhow::anyhow;
 pub use anyhow::{ensure, Result};
 
-use paralegal_policy::{RootContext, GraphLocation};
+use paralegal_policy::{GraphLocation, RootContext};
 
 lazy_static::lazy_static! {
     static ref TOOL_BUILT: PathBuf = {

diff --git a/guide/deletion-policy/Cargo.lock b/guide/deletion-policy/Cargo.lock
diff --git a/guide/deletion-policy/src/main.rs b/guide/deletion-policy/src/main.rs
@@ -1,10 +1,10 @@
 use anyhow::Result;
 use paralegal_policy::{
-    assert_error, paralegal_spdg::traverse::EdgeSelection, Context, Marker, NodeExt,
+    assert_error, paralegal_spdg::traverse::EdgeSelection, Marker, NodeExt, RootContext,
 };
 use std::sync::Arc;
 
-fn dummy_policy(_ctx: Arc<Context>) -> Result<()> {
+fn dummy_policy(_ctx: Arc<RootContext>) -> Result<()> {
     println!("Graph loaded.");
     Ok(())
 }
@@ -20,7 +20,7 @@ fn main() -> Result<()> {
 }
 
 #[allow(dead_code)]
-fn deletion_policy(ctx: Arc<Context>) -> Result<()> {
+fn deletion_policy(ctx: Arc<RootContext>) -> Result<()> {
     let user_data_types = ctx.marked_type(Marker::new_intern("user_data"));
 
     let found = ctx.all_controllers().any(|(deleter_id, _ignored)| {