grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed warnings

Browse Source
This commit is contained in:
Nikolay Volf 2016-04-21 23:23:06 +03:00
parent 729f9c803d
commit 04e704603f
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ipc/codegen/src/serialization.rs
View File

@ -18,17 +18,7 @@ use aster;
use syntax::ast::{ use syntax::ast::{
MetaItem, MetaItem,
Item, Item,
ImplItemKind,
ImplItem,
MethodSig,
Arg,
PatKind,
FunctionRetTy,
Ty,
TraitRef,
Ident, Ident,
Generics,
TyKind,
}; };
use syntax::ast; use syntax::ast;
@ -203,7 +193,6 @@ fn binary_expr_struct(
map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).unwrap()); map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).unwrap());
map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).unwrap()); map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).unwrap());
for (index, field) in fields.iter().enumerate() { for (index, field) in fields.iter().enumerate() {
let size_expr = &size_exprs[index];
let field_type_ident = builder.id(&::syntax::print::pprust::ty_to_string(&field.ty)); let field_type_ident = builder.id(&::syntax::print::pprust::ty_to_string(&field.ty));
let member_expr = match value_ident { let member_expr = match value_ident {
@ -223,7 +212,7 @@ fn binary_expr_struct(
}).unwrap()); }).unwrap());
write_stmts.push(quote_stmt!(cx, write_stmts.push(quote_stmt!(cx,
$member_expr .to_bytes(&mut buffer[offset..next_line], length_stack);).unwrap()); if let Err(e) = $member_expr .to_bytes(&mut buffer[offset..next_line], length_stack) { return Err(e) };).unwrap());
write_stmts.push(quote_stmt!(cx, offset = next_line; ).unwrap()); write_stmts.push(quote_stmt!(cx, offset = next_line; ).unwrap());
@ -339,7 +328,7 @@ struct BinaryArm {
fn fields_sequence( fn fields_sequence(
ext_cx: &ExtCtxt, ext_cx: &ExtCtxt,
ty: &P<ast::Ty>, _ty: &P<ast::Ty>,
fields: &[ast::StructField], fields: &[ast::StructField],
variant_ident: &ast::Ident, variant_ident: &ast::Ident,
) -> ast::Expr { ) -> ast::Expr {
@ -381,10 +370,14 @@ fn fields_sequence(
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain))); tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
tt.push(Token(_sp, token::DotDot)); tt.push(Token(_sp, token::DotDot));
tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
tt.push(Token(_sp, token::OpenDelim(token::Bracket))); if idx+1 != fields.len() {
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain))); tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
}
tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
tt.push(Token(_sp, token::Comma)); tt.push(Token(_sp, token::Comma));
@ -451,11 +444,13 @@ fn named_fields_sequence(
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain))); tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx)), token::Plain)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
tt.push(Token(_sp, token::DotDot)); tt.push(Token(_sp, token::DotDot));
tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain))); if idx + 1 != fields.len() {
tt.push(Token(_sp, token::OpenDelim(token::Bracket))); tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map"), token::Plain)));
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain))); tt.push(Token(_sp, token::OpenDelim(token::Bracket)));
tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1)), token::Plain)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
}
tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
tt.push(Token(_sp, token::CloseDelim(token::Bracket))); tt.push(Token(_sp, token::CloseDelim(token::Bracket)));
tt.push(Token(_sp, token::Comma)); tt.push(Token(_sp, token::Comma));
@ -477,14 +472,12 @@ fn binary_expr_variant(
cx: &ExtCtxt, cx: &ExtCtxt,
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
type_ident: Ident, type_ident: Ident,
generics: &ast::Generics, _generics: &ast::Generics,
ty: P<ast::Ty>, ty: P<ast::Ty>,
span: Span, _span: Span,
variant: &ast::Variant, variant: &ast::Variant,
variant_index: usize, variant_index: usize,
) -> Result<BinaryArm, Error> { ) -> Result<BinaryArm, Error> {
let type_name = ::syntax::print::pprust::ty_to_string(&ty);
let variant_ident = variant.node.name; let variant_ident = variant.node.name;
let variant_index_ident = builder.id(format!("{}", variant_index)); let variant_index_ident = builder.id(format!("{}", variant_index));

2
ipc/tests/binary.rs
View File

@ -14,4 +14,6 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
#![allow(dead_code, unused_assignments)] // codegen issues
include!(concat!(env!("OUT_DIR"), "/binary.rs")); include!(concat!(env!("OUT_DIR"), "/binary.rs"));

1
ipc/tests/binary.rs.in
View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use ipc::*; use ipc::*;
use std::mem; use std::mem;
use std::collections::VecDeque; use std::collections::VecDeque;