Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.

Commit d0f61cc

Browse files
committed
More cleanup
1 parent 1e90401 commit d0f61cc

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

postgres-derive-codegen/src/fromsql.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,23 +184,17 @@ fn composite_from_sql_body(ctx: &mut ExtCtxt,
184184

185185
let num_fields = try!(read_be_i32(r));
186186
if num_fields as usize != fields.len() {
187-
let err: ::std::boxed::Box<::std::error::Error
188-
+ ::std::marker::Sync
189-
+ ::std::marker::Send>
190-
= format!("expected {} fields but saw {}", fields.len(), num_fields).into();
191-
return ::std::result::Result::Err(::postgres::error::Error::Conversion(err))
187+
return ::std::result::Result::Err(::postgres::error::Error::Conversion(
188+
format!("expected {} fields but saw {}", fields.len(), num_fields).into()));
192189
}
193190

194191
$declare_vars;
195192

196193
for field in fields {
197194
let oid = try!(read_be_i32(r)) as u32;
198195
if oid != field.type_().oid() {
199-
let err: ::std::boxed::Box<::std::error::Error
200-
+ ::std::marker::Sync
201-
+ ::std::marker::Send>
202-
= format!("expected OID {} but saw {}", field.type_().oid(), oid).into();
203-
return ::std::result::Result::Err(::postgres::error::Error::Conversion(err))
196+
return ::std::result::Result::Err(::postgres::error::Error::Conversion(
197+
format!("expected OID {} but saw {}", field.type_().oid(), oid).into()));
204198
}
205199

206200
let len = try!(read_be_i32(r));

0 commit comments

Comments
 (0)