fluencelabs/marine-rs-sdk
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine-rs-sdk synced 2025-03-15 06:20:50 +00:00
Code Issues Projects Releases Wiki Activity

fix: make new clippy happy (#88)

Browse Source
This commit is contained in:
Valery Antopol 2022-11-28 19:12:02 +03:00 committed by GitHub
parent f5e1ad6a8e
commit f2f3ce1810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/main/src/export_allocator.rs
View File

@ -23,6 +23,7 @@ pub unsafe fn allocate(elem_count: usize, elem_ty: usize) -> usize {
return 0;
}
#[allow(clippy::let_and_return)]
let allocated_mem = allocate_impl(elem_count, elem_ty);
crate::debug_log!(format!(
"sdk.allocate: {} {} -> {}\n",

2
crates/main/src/lib.rs
View File

@ -66,7 +66,7 @@ macro_rules! debug_log {
let level = log::Level::Info as i32;
let target = 0i32;
let msg = $msg_generator;
crate::logger::log_utf8_string(level, target, msg.as_ptr() as i32, msg.len() as i32);
$crate::logger::log_utf8_string(level, target, msg.as_ptr() as i32, msg.len() as i32);
}
};
}

2
crates/marine-macro-impl/src/parsed_type.rs
View File

@ -57,7 +57,7 @@ pub enum ParsedType {
Record(String, PassingStyle), // short type name
}
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
pub enum PassingStyle {
ByValue,
ByRef,

3
crates/marine-macro-impl/src/parsed_type/foreign_mod_prolog.rs
View File

@ -111,8 +111,7 @@ impl ForeignModPrologGlueCodeGenerator for Vec<AstFnArgument> {
let raw_arg_types: Vec<RustType> = self
.iter()
.map(|input_type| input_type.generate_arguments())
.flatten()
.flat_map(|input_type| input_type.generate_arguments())
.collect();
let raw_arg_names: Vec<syn::Ident> = raw_arg_types
.iter()

2
crates/marine-macro-impl/src/parsed_type/traits.rs
View File

@ -131,7 +131,7 @@ impl fmt::Display for ParsedType {
}
ParsedType::Record(record_name, passing_style) => {
passing_style.fmt(f)?;
f.write_str(&record_name)
f.write_str(record_name)
}
}?;

2
crates/marine-macro-impl/src/parsed_type/vector_ser_der/der.rs
View File

@ -40,7 +40,7 @@ pub(super) fn vector_der(arg_name: &str, ty: &ParsedType) -> proc_macro2::TokenS
let deserializer_name = crate::utils::prepare_ident(deserializer_name);
let deserializer_ident = crate::new_ident!(deserializer_name);
let inner_vector_deserializer = super::generate_vector_der(&*ty, &deserializer_name);
let inner_vector_deserializer = super::generate_vector_der(ty, &deserializer_name);
quote! {
#inner_vector_deserializer

10
crates/marine-macro-impl/src/token_stream_generator/foreign_mod_generator.rs
View File

@ -34,11 +34,11 @@ impl quote::ToTokens for ast_types::AstExternMod {
);
let wasm_import_module_name = &self.namespace;
let wasm_section_items = generate_extern_section_items(&self, wasm_extern_item_generator);
let wasm_section_items = generate_extern_section_items(self, wasm_extern_item_generator);
let not_wasm_section_items =
generate_extern_section_items(&self, not_wasm_extern_item_generator);
generate_extern_section_items(self, not_wasm_extern_item_generator);
let wrapper_functions = generate_wrapper_functions(&self);
let wrapper_functions = generate_wrapper_functions(self);
let glue_code = quote! {
#[link(wasm_import_module = #wasm_import_module_name)]
@ -72,7 +72,7 @@ fn generate_extern_section_items(
let mut section_items = Vec::with_capacity(extern_item.imports.len());
for import in &extern_item.imports {
section_items.push(item_generator(&import));
section_items.push(item_generator(import));
}
section_items
@ -109,7 +109,7 @@ fn not_wasm_extern_item_generator(import: &ast_types::AstExternFn) -> TokenStrea
}
fn generate_original_arguments(
arguments: &Vec<ast_types::AstFnArgument>,
arguments: &[ast_types::AstFnArgument],
) -> Vec<proc_macro2::TokenStream> {
arguments
.iter()

12
crates/marine-macro-impl/src/token_stream_generator/record_generator/field_values_builder.rs
View File

@ -64,16 +64,14 @@ impl FieldValuesBuilder {
self.fields_der.extend(field_der);
}
let outcome = FieldValuesOutcome {
FieldValuesOutcome {
fields_der: self.fields_der,
field_value_idents: self.field_value_idents,
};
outcome
}
}
fn field_der(&mut self, ast_field: &AstRecordField, field: &syn::Ident) -> TokenStream {
let der = match &ast_field.ty {
match &ast_field.ty {
ParsedType::Boolean(_) => self.bool_der(field),
ParsedType::I8(_) => self.i8_der(field),
ParsedType::I16(_) => self.i16_der(field),
@ -88,9 +86,7 @@ impl FieldValuesBuilder {
ParsedType::Utf8Str(_) | ParsedType::Utf8String(_) => self.string_der(field),
ParsedType::Vector(ty, _) => self.vector_der(ty, field),
ParsedType::Record(name, _) => self.record_der(name, field),
};
der
}
}
fn bool_der(&mut self, field: &syn::Ident) -> TokenStream {

8
crates/marine-macro-impl/src/utils.rs
View File

@ -26,19 +26,19 @@ macro_rules! new_ident {
macro_rules! prepare_global_data {
($mtype: ident, $self: ident, $name: expr, $data: ident, $data_size: ident, $global_static_name: ident, $section_name: ident) => {
// TODO: change serialization protocol
let mtype = crate::export_ast_types::SDKAst::$mtype($self.clone().into());
let mtype = $crate::export_ast_types::SDKAst::$mtype($self.clone().into());
let $data = serde_json::to_vec(&mtype).unwrap();
let $data_size = $data.len();
let $data = syn::LitByteStr::new(&$data, proc_macro2::Span::call_site());
let $global_static_name = crate::new_ident!(format!(
let $global_static_name = $crate::new_ident!(format!(
"{}{}",
crate::token_stream_generator::GENERATED_GLOBAL_PREFIX,
$crate::token_stream_generator::GENERATED_GLOBAL_PREFIX,
$name.replace(".", "_"),
));
let $section_name = format!(
"{}{}",
crate::token_stream_generator::GENERATED_SECTION_PREFIX,
$crate::token_stream_generator::GENERATED_SECTION_PREFIX,
$name.replace(".", "_"),
);
};