Skip to content

Commit

Permalink
Use core::result instead of std::result in order to make it work in a…
Browse files Browse the repository at this point in the history
… no_std environment. (#189)

Co-authored-by: Danny Milosavljevic <daym@oxidecomputer.com>
  • Loading branch information
daym and daym committed Oct 26, 2021
1 parent 7b68e4d commit 1a703a4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions strum_macros/src/macros/strings/from_string.rs
Expand Up @@ -19,7 +19,7 @@ pub fn from_string_inner(ast: &DeriveInput) -> syn::Result<TokenStream> {

let mut default_kw = None;
let mut default =
quote! { _ => ::std::result::Result::Err(#strum_module_path::ParseError::VariantNotFound) };
quote! { _ => ::core::result::Result::Err(#strum_module_path::ParseError::VariantNotFound) };
let mut arms = Vec::new();
for variant in variants {
let ident = &variant.ident;
Expand All @@ -46,7 +46,7 @@ pub fn from_string_inner(ast: &DeriveInput) -> syn::Result<TokenStream> {

default_kw = Some(kw);
default = quote! {
default => ::std::result::Result::Ok(#name::#ident(default.into()))
default => ::core::result::Result::Ok(#name::#ident(default.into()))
};
continue;
}
Expand Down Expand Up @@ -82,16 +82,16 @@ pub fn from_string_inner(ast: &DeriveInput) -> syn::Result<TokenStream> {
}
};

arms.push(quote! { #(#attrs => ::std::result::Result::Ok(#name::#ident #params)),* });
arms.push(quote! { #(#attrs => ::core::result::Result::Ok(#name::#ident #params)),* });
}

arms.push(default);

let from_str = quote! {
#[allow(clippy::use_self)]
impl #impl_generics ::std::str::FromStr for #name #ty_generics #where_clause {
impl #impl_generics ::core::str::FromStr for #name #ty_generics #where_clause {
type Err = #strum_module_path::ParseError;
fn from_str(s: &str) -> ::std::result::Result< #name #ty_generics , Self::Err> {
fn from_str(s: &str) -> ::core::result::Result< #name #ty_generics , Self::Err> {
match s {
#(#arms),*
}
Expand Down

0 comments on commit 1a703a4

Please sign in to comment.