Revert "xso-proc: Replace std stuff with alloc/core stuff"
This reverts commit 4e5f0bc961.
Unfortunately, in std contexts, the `alloc` crate is not imported. That
means we cannot rely on it being accessible and it in fact breaks builds
of crates which are not `no_std`.
Fixes #155.
This commit is contained in:
parent
33098e6f2c
commit
6ec275d381
8 changed files with 8 additions and 12 deletions
|
|
@ -140,7 +140,7 @@ impl NameVariant {
|
||||||
quote! {
|
quote! {
|
||||||
let name = (
|
let name = (
|
||||||
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
||||||
::alloc::borrow::Cow::Borrowed(#xml_name),
|
::std::borrow::Cow::Borrowed(#xml_name),
|
||||||
);
|
);
|
||||||
#init
|
#init
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ impl Field for AttributeField {
|
||||||
generator: quote! {
|
generator: quote! {
|
||||||
#as_optional_xml_text(#bound_name)?.map(|#bound_name| ::xso::Item::Attribute(
|
#as_optional_xml_text(#bound_name)?.map(|#bound_name| ::xso::Item::Attribute(
|
||||||
#xml_namespace,
|
#xml_namespace,
|
||||||
::alloc::borrow::Cow::Borrowed(#xml_name),
|
::std::borrow::Cow::Borrowed(#xml_name),
|
||||||
#bound_name,
|
#bound_name,
|
||||||
));
|
));
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -423,7 +423,7 @@ impl ExtractDef {
|
||||||
quote! {
|
quote! {
|
||||||
let name = (
|
let name = (
|
||||||
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
||||||
::alloc::borrow::Cow::Borrowed(#xml_name),
|
::std::borrow::Cow::Borrowed(#xml_name),
|
||||||
);
|
);
|
||||||
#init
|
#init
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ impl Field for TextField {
|
||||||
|
|
||||||
Ok(FieldBuilderPart::Text {
|
Ok(FieldBuilderPart::Text {
|
||||||
value: FieldTempInit {
|
value: FieldTempInit {
|
||||||
init: quote! { ::alloc::string::String::new() },
|
init: quote! { ::std::string::String::new() },
|
||||||
ty: string_ty(Span::call_site()),
|
ty: string_ty(Span::call_site()),
|
||||||
},
|
},
|
||||||
collect: quote! {
|
collect: quote! {
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ return to `xso` for more information**. The documentation of
|
||||||
**You have been warned.**
|
**You have been warned.**
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern crate alloc;
|
|
||||||
|
|
||||||
// Wondering about RawTokenStream vs. TokenStream?
|
// Wondering about RawTokenStream vs. TokenStream?
|
||||||
// syn mostly works with proc_macro2, while the proc macros themselves use
|
// syn mostly works with proc_macro2, while the proc macros themselves use
|
||||||
// proc_macro.
|
// proc_macro.
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,7 @@ impl StructInner {
|
||||||
quote! {
|
quote! {
|
||||||
let name = (
|
let name = (
|
||||||
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
::xso::exports::rxml::Namespace::from(#xml_namespace),
|
||||||
::alloc::borrow::Cow::Borrowed(#xml_name),
|
::std::borrow::Cow::Borrowed(#xml_name),
|
||||||
);
|
);
|
||||||
#init
|
#init
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ pub(crate) fn cow_ty(ty: Type, lifetime: Lifetime) -> Type {
|
||||||
}),
|
}),
|
||||||
segments: [
|
segments: [
|
||||||
PathSegment {
|
PathSegment {
|
||||||
ident: Ident::new("alloc", span),
|
ident: Ident::new("std", span),
|
||||||
arguments: PathArguments::None,
|
arguments: PathArguments::None,
|
||||||
},
|
},
|
||||||
PathSegment {
|
PathSegment {
|
||||||
|
|
@ -233,7 +233,7 @@ pub(crate) fn default_fn(of_ty: Type) -> Expr {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Construct a [`syn::Type`] referring to `::alloc::string::String`.
|
/// Construct a [`syn::Type`] referring to `::std::string::String`.
|
||||||
pub(crate) fn string_ty(span: Span) -> Type {
|
pub(crate) fn string_ty(span: Span) -> Type {
|
||||||
Type::Path(TypePath {
|
Type::Path(TypePath {
|
||||||
qself: None,
|
qself: None,
|
||||||
|
|
@ -243,7 +243,7 @@ pub(crate) fn string_ty(span: Span) -> Type {
|
||||||
}),
|
}),
|
||||||
segments: [
|
segments: [
|
||||||
PathSegment {
|
PathSegment {
|
||||||
ident: Ident::new("alloc", span),
|
ident: Ident::new("std", span),
|
||||||
arguments: PathArguments::None,
|
arguments: PathArguments::None,
|
||||||
},
|
},
|
||||||
PathSegment {
|
PathSegment {
|
||||||
|
|
|
||||||
|
|
@ -588,7 +588,6 @@ a field, for consistency.
|
||||||
#### Example without codec
|
#### Example without codec
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
# extern crate alloc;
|
|
||||||
# use xso::FromXml;
|
# use xso::FromXml;
|
||||||
#[derive(FromXml, Debug, PartialEq)]
|
#[derive(FromXml, Debug, PartialEq)]
|
||||||
#[xml(namespace = "urn:example", name = "foo")]
|
#[xml(namespace = "urn:example", name = "foo")]
|
||||||
|
|
@ -606,7 +605,6 @@ assert_eq!(foo, Foo {
|
||||||
#### Example with codec
|
#### Example with codec
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
# extern crate alloc;
|
|
||||||
# use xso::FromXml;
|
# use xso::FromXml;
|
||||||
#[derive(FromXml, Debug, PartialEq)]
|
#[derive(FromXml, Debug, PartialEq)]
|
||||||
#[xml(namespace = "urn:example", name = "foo")]
|
#[xml(namespace = "urn:example", name = "foo")]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue