From 7174f6422dc8d62c9b413eddff5af2b84de9bc4f Mon Sep 17 00:00:00 2001 From: Andre Nathan Date: Fri, 5 Nov 2021 14:07:13 -0300 Subject: [PATCH] Generate qualified Result type in derive (#430) --- derive/src/derive_enum.rs | 4 ++-- derive/src/derive_struct.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/derive/src/derive_enum.rs b/derive/src/derive_enum.rs index 6ab9f30..9a870bc 100644 --- a/derive/src/derive_enum.rs +++ b/derive/src/derive_enum.rs @@ -97,7 +97,7 @@ impl DeriveEnum { .generate_fn("borrow_decode") .with_generic("D", ["bincode::de::BorrowDecoder<'__de>"]) .with_arg("mut decoder", "D") - .with_return_type("Result") + .with_return_type("core::result::Result") .body(|fn_builder| { fn_builder .push_parsed("let variant_index = ::decode(&mut decoder)?;").unwrap(); @@ -147,7 +147,7 @@ impl DeriveEnum { .generate_fn("decode") .with_generic("D", ["bincode::de::Decoder"]) .with_arg("mut decoder", "D") - .with_return_type("Result") + .with_return_type("core::result::Result") .body(|fn_builder| { fn_builder .push_parsed("let variant_index = ::decode(&mut decoder)?;").unwrap(); diff --git a/derive/src/derive_struct.rs b/derive/src/derive_struct.rs index 8c08f56..d341e63 100644 --- a/derive/src/derive_struct.rs +++ b/derive/src/derive_struct.rs @@ -18,7 +18,7 @@ impl DeriveStruct { .with_generic("E", ["bincode::enc::Encoder"]) .with_self_arg(crate::generate::FnSelfArg::RefSelf) .with_arg("mut encoder", "E") - .with_return_type("Result<(), bincode::error::EncodeError>") + .with_return_type("core::result::Result<(), bincode::error::EncodeError>") .body(|fn_body| { for field in fields.names() { fn_body @@ -47,7 +47,7 @@ impl DeriveStruct { .generate_fn("borrow_decode") .with_generic("D", ["bincode::de::BorrowDecoder<'__de>"]) .with_arg("mut decoder", "D") - .with_return_type("Result") + .with_return_type("core::result::Result") .body(|fn_body| { // Ok(Self { fn_body.ident_str("Ok"); @@ -77,7 +77,7 @@ impl DeriveStruct { .generate_fn("decode") .with_generic("D", ["bincode::de::Decoder"]) .with_arg("mut decoder", "D") - .with_return_type("Result") + .with_return_type("core::result::Result") .body(|fn_body| { // Ok(Self { fn_body.ident_str("Ok");