Skip to content

Commit f5acbc0

Browse files
authored
Merge pull request #217 from mlabs-haskell/szg251/lbr-prelude-derive
lbr-prelude-derive: fully qualify Result to solve conflicts with user defined Result type in target module
2 parents 22728a2 + 3f60380 commit f5acbc0

File tree

1 file changed

+4
-4
lines changed
  • runtimes/rust/lbr-prelude-derive/src

1 file changed

+4
-4
lines changed

runtimes/rust/lbr-prelude-derive/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ fn impl_struct(
9393
let keys = named.iter().map(|field| &field.ident);
9494

9595
let from_json_impl = quote! {
96-
fn from_json(value: &serde_json::Value) -> Result<Self, lbr_prelude::error::Error> {
96+
fn from_json(value: &serde_json::Value) -> std::result::Result<Self, lbr_prelude::error::Error> {
9797
match value {
9898
serde_json::Value::Object(dict) => {
9999
#(#dict_get)*
@@ -135,7 +135,7 @@ fn impl_tuple(
135135
};
136136

137137
let from_json_impl = quote! {
138-
fn from_json(value: &serde_json::Value) -> Result<Self, lbr_prelude::error::Error> {
138+
fn from_json(value: &serde_json::Value) -> std::result::Result<Self, lbr_prelude::error::Error> {
139139
Vec::from_json(value).and_then(|vec: Vec<serde_json::Value>| {
140140
if vec.len() == #arity {
141141
Ok(Self(
@@ -166,7 +166,7 @@ fn impl_newtype() -> (proc_macro2::TokenStream, proc_macro2::TokenStream) {
166166
};
167167

168168
let from_json_impl = quote! {
169-
fn from_json(value: &serde_json::Value) -> Result<Self, lbr_prelude::error::Error> {
169+
fn from_json(value: &serde_json::Value) -> std::result::Result<Self, lbr_prelude::error::Error> {
170170
Ok(Self(lbr_prelude::json::Json::from_json(value)?))
171171
}
172172
};
@@ -269,7 +269,7 @@ fn impl_enum(
269269
});
270270

271271
let from_json_impl = quote! {
272-
fn from_json(value: &serde_json::Value) -> Result<Self, lbr_prelude::error::Error> {
272+
fn from_json(value: &serde_json::Value) -> std::result::Result<Self, lbr_prelude::error::Error> {
273273
lbr_prelude::json::case_json_constructor(#ident_str, vec![
274274
#(#from_json_match_arms),*
275275
],

0 commit comments

Comments
 (0)