From 9993cf522c7a7970bc2c0f2f56efed426c9657b6 Mon Sep 17 00:00:00 2001
From: Vytautas Astrauskas <vastrauskas@gmail.com>
Date: Sat, 11 Jan 2020 17:19:59 +0100
Subject: [PATCH] Rustfmt.

---
 examples/generate_skeleton.rs |  2 +-
 src/generator.rs              | 32 ++++++++++++++------------------
 src/generator_new/mod.rs      |  2 +-
 tests/cspa_rules.rs           |  1 -
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/examples/generate_skeleton.rs b/examples/generate_skeleton.rs
index b9044b5..6fffcf2 100644
--- a/examples/generate_skeleton.rs
+++ b/examples/generate_skeleton.rs
@@ -1,5 +1,5 @@
-use std::env;
 use datapond;
+use std::env;
 
 fn main() {
     if env::var("RUST_LOG").is_ok() {
diff --git a/src/generator.rs b/src/generator.rs
index 7666a05..c014391 100644
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -909,26 +909,25 @@ fn generate_skeleton_code(
             let relation_args = join_args_as_tuple(&declared_args, &key, &args);
             format!("({}, _)", relation_args)
         } else {
-            let arg_names: Vec<_> = indexed_literal
-                .args
-                .iter()
-                .map(|v| v.to_string())
-                .collect();
-            
+            let arg_names: Vec<_> = indexed_literal.args.iter().map(|v| v.to_string()).collect();
+
             let canonicalized_key: Vec<_> = key
                 .iter()
                 .map(|v| canonicalize_arg_name(&decls, &indexed_literal.predicate, &arg_names, v))
                 .collect();
-                
+
             let canonicalized_args: Vec<_> = args
                 .iter()
                 .map(|v| canonicalize_arg_name(&decls, &indexed_literal.predicate, &arg_names, v))
                 .collect();
-                
-            produced_key = join_args_as_tuple(&canonicalized_key, &canonicalized_key, &canonicalized_args);
-            produced_args = join_args_as_tuple(&canonicalized_args, &canonicalized_key, &canonicalized_args);
 
-            let relation_args = join_args_as_tuple(&declared_args, &canonicalized_key, &canonicalized_args);
+            produced_key =
+                join_args_as_tuple(&canonicalized_key, &canonicalized_key, &canonicalized_args);
+            produced_args =
+                join_args_as_tuple(&canonicalized_args, &canonicalized_key, &canonicalized_args);
+
+            let relation_args =
+                join_args_as_tuple(&declared_args, &canonicalized_key, &canonicalized_args);
 
             relation_args
         };
@@ -1073,13 +1072,10 @@ fn find_arg_decl<'a>(
     args: &Vec<String>,
     variable: &str,
 ) -> &'a ast::ParamDecl {
-    let idx = args
-        .iter()
-        .position(|arg| arg == variable)
-        .expect(&format!(
-            "Couldn't find variable {:?} in the specified args: {:?}",
-            variable, args
-        ));
+    let idx = args.iter().position(|arg| arg == variable).expect(&format!(
+        "Couldn't find variable {:?} in the specified args: {:?}",
+        variable, args
+    ));
 
     let predicate_arg_decls = &global_decls[&predicate.to_string()];
     let arg_decl = &predicate_arg_decls.parameters[idx];
diff --git a/src/generator_new/mod.rs b/src/generator_new/mod.rs
index 90e8f32..f630235 100644
--- a/src/generator_new/mod.rs
+++ b/src/generator_new/mod.rs
@@ -13,4 +13,4 @@ pub fn generate_datafrog(input: TokenStream) -> TokenStream {
     let typechecked_program = crate::typechecker::typecheck(parsed_program).unwrap();
     let encoded_program = encode::encode(typechecked_program);
     encoded_program.to_token_stream()
-}
\ No newline at end of file
+}
diff --git a/tests/cspa_rules.rs b/tests/cspa_rules.rs
index 34871ac..f83b4cc 100644
--- a/tests/cspa_rules.rs
+++ b/tests/cspa_rules.rs
@@ -186,7 +186,6 @@ fn ensure_generated_rules_build() {
     memory_alias.extend(assign.iter().map(|&(x, _y)| (x, x)));
 
     while iteration.changed() {
-
         // Index maintenance
         value_flow_b.from_map(&value_flow, |&(a, b)| (b, a));
         value_flow_a.from_map(&value_flow, |&(a, b)| (a, b)); // useless index