Skip to content

Commit

Permalink
Rustfmt.
Browse files Browse the repository at this point in the history
  • Loading branch information
vakaras committed Jan 17, 2020
1 parent e04fe26 commit 514647c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion datapond-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ use proc_macro_hack::proc_macro_hack;
#[proc_macro_hack]
pub fn datapond(input: TokenStream) -> TokenStream {
datapond::generate_datafrog(input.into()).into()
}
}
2 changes: 1 addition & 1 deletion src/generator.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::data_structures::OrderedMap;
use crate::{ast, parser, typechecker};
use quote::ToTokens;
use rustc_hash::{FxHashMap, FxHashSet};
use crate::data_structures::OrderedMap;
use std::fmt::{self, Write};

type HashMap<K, V> = OrderedMap<K, V>;
Expand Down
6 changes: 3 additions & 3 deletions src/generator_new/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream;
use quote::{ToTokens, quote};
use quote::{quote, ToTokens};

mod ast;
mod encode;
Expand All @@ -11,14 +11,14 @@ pub fn generate_datafrog(input: TokenStream) -> TokenStream {
Err(err) => {
let tokens = TokenStream::from(err.to_compile_error());
return quote! { {#tokens }};
},
}
};
let typechecked_program = match crate::typechecker::typecheck(parsed_program) {
Ok(program) => program,
Err(err) => {
let tokens = TokenStream::from(err.to_syn_error().to_compile_error());
return quote! { {#tokens }};
},
}
};
let encoded_program = encode::encode(typechecked_program);
encoded_program.to_token_stream()
Expand Down
3 changes: 2 additions & 1 deletion src/typechecker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ fn check_body(
}
for key in kwargs.keys() {
if !available_parameters.contains(key) {
let available_parameters: Vec<_> = available_parameters.into_iter().collect();
let available_parameters: Vec<_> =
available_parameters.into_iter().collect();
let parameter_span = kwargs[key].param.span();
return Err(Error::new(
format!("Unknown parameter {} in predicate {}. Available parameters are: {}.",
Expand Down

0 comments on commit 514647c

Please sign in to comment.