Add no_std support #158
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -314,7 +314,7 @@ impl FieldType { | |||||||
| format!("{}{}{}", m.get_modules(desc), m.name, lifetime) | ||||||||
| } | ||||||||
| FieldType::Map(ref key, ref value) => format!( | ||||||||
| "KVMap<{}, {}>", | ||||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. Hey @tafia, sorry for the delay in the reply! Thanks for taking a look 😄 I added the There was a problem hiding this comment. I checked, the alias, actually does not reflect in the docs because its private. It's really pretty invisible to the user of the struct... |
||||||||
| key.rust_type(desc)?, | ||||||||
| value.rust_type(desc)? | ||||||||
| ), | ||||||||
|
|
@@ -449,15 +449,15 @@ impl Field { | |||||||
| "i32" => format!("{}i32", *d), | ||||||||
| "i64" => format!("{}i64", *d), | ||||||||
| "f32" => match &*d.to_lowercase() { | ||||||||
| "inf" => "::core::f32::INFINITY".to_string(), | ||||||||
| "-inf" => "::core::f32::NEG_INFINITY".to_string(), | ||||||||
| "nan" => "::core::f32::NAN".to_string(), | ||||||||
| _ => format!("{}f32", *d), | ||||||||
| }, | ||||||||
| "f64" => match &*d.to_lowercase() { | ||||||||
| "inf" => "::core::f64::INFINITY".to_string(), | ||||||||
| "-inf" => "::core::f64::NEG_INFINITY".to_string(), | ||||||||
| "nan" => "::core::f64::NAN".to_string(), | ||||||||
| _ => format!("{}f64", *d), | ||||||||
| }, | ||||||||
| "Cow<'a, str>" => format!("Cow::Borrowed({})", d), | ||||||||
|
|
@@ -849,19 +849,43 @@ impl Message { | |||||||
| writeln!(w)?; | ||||||||
| writeln!(w, "pub mod mod_{} {{", self.name)?; | ||||||||
| writeln!(w)?; | ||||||||
| if config.nostd { | ||||||||
| writeln!(w, "use alloc::vec::Vec;")?; | ||||||||
| } | ||||||||
| if self.messages.iter().any(|m| { | ||||||||
| m.all_fields() | ||||||||
| .any(|f| (f.typ.has_cow() || (f.packed() && f.typ.is_fixed_size()))) | ||||||||
| }) { | ||||||||
| if config.nostd { | ||||||||
| writeln!(w, "use alloc::borrow::Cow;")?; | ||||||||
| } else { | ||||||||
| writeln!(w, "use std::borrow::Cow;")?; | ||||||||
| } | ||||||||
| } | ||||||||
| if config.nostd | ||||||||
| && self.messages.iter().any(|m| { | ||||||||
| desc.owned && m.has_lifetime(desc, &mut Vec::new()) | ||||||||
| || m.all_fields().any(|f| f.boxed) | ||||||||
| }) | ||||||||
| { | ||||||||
| writeln!(w)?; | ||||||||
| writeln!(w, "use alloc::boxed::Box;")?; | ||||||||
| } | ||||||||
| if self | ||||||||
| .messages | ||||||||
| .iter() | ||||||||
| .any(|m| m.all_fields().any(|f| f.typ.is_map())) | ||||||||
| { | ||||||||
| if config.hashbrown { | ||||||||
| writeln!(w, "use hashbrown::HashMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = HashMap<K, V>;")?; | ||||||||
| } else if config.nostd { | ||||||||
| writeln!(w, "use alloc::collections::BTreeMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = BTreeMap<K, V>;")?; | ||||||||
| } else { | ||||||||
| writeln!(w, "use std::collections::HashMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = HashMap<K, V>;")?; | ||||||||
| } | ||||||||
| } | ||||||||
| if !self.messages.is_empty() || !self.oneofs.is_empty() { | ||||||||
| writeln!(w, "use super::*;")?; | ||||||||
|
|
@@ -1045,31 +1069,31 @@ impl Message { | |||||||
| struct {name}OwnedInner {{ | ||||||||
| buf: Vec<u8>, | ||||||||
| proto: {name}<'static>, | ||||||||
| _pin: core::marker::PhantomPinned, | ||||||||
| }} | ||||||||
|
|
||||||||
| impl {name}OwnedInner {{ | ||||||||
| fn new(buf: Vec<u8>) -> Result<core::pin::Pin<Box<Self>>> {{ | ||||||||
| let inner = Self {{ | ||||||||
| buf, | ||||||||
| proto: unsafe {{ core::mem::MaybeUninit::zeroed().assume_init() }}, | ||||||||
| _pin: core::marker::PhantomPinned, | ||||||||
| }}; | ||||||||
| let mut pinned = Box::pin(inner); | ||||||||
|
|
||||||||
| let mut reader = BytesReader::from_bytes(&pinned.buf); | ||||||||
| let proto = {name}::from_reader(&mut reader, &pinned.buf)?; | ||||||||
|
|
||||||||
| unsafe {{ | ||||||||
| let proto = core::mem::transmute::<_, {name}<'static>>(proto); | ||||||||
| pinned.as_mut().get_unchecked_mut().proto = proto; | ||||||||
| }} | ||||||||
| Ok(pinned) | ||||||||
| }} | ||||||||
| }} | ||||||||
|
|
||||||||
| pub struct {name}Owned {{ | ||||||||
| inner: core::pin::Pin<Box<{name}OwnedInner>>, | ||||||||
| }} | ||||||||
|
|
||||||||
| #[allow(dead_code)] | ||||||||
|
|
@@ -1083,8 +1107,8 @@ impl Message { | |||||||
| }} | ||||||||
| }} | ||||||||
|
|
||||||||
| impl core::fmt::Debug for {name}Owned {{ | ||||||||
| fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {{ | ||||||||
| self.inner.proto.fmt(f) | ||||||||
| }} | ||||||||
| }} | ||||||||
|
|
@@ -1123,7 +1147,7 @@ impl Message { | |||||||
| }} | ||||||||
| }} | ||||||||
| "#, | ||||||||
| name = self.name, | ||||||||
| )?; | ||||||||
| Ok(()) | ||||||||
| } | ||||||||
|
|
@@ -1144,7 +1168,7 @@ impl Message { | |||||||
| fn write_write_message<W: Write>(&self, w: &mut W, desc: &FileDescriptor) -> Result<()> { | ||||||||
| writeln!( | ||||||||
| w, | ||||||||
| " fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {{" | ||||||||
| )?; | ||||||||
| for f in self.fields.iter().filter(|f| !f.deprecated) { | ||||||||
| f.write_write(w, desc)?; | ||||||||
|
|
@@ -1658,6 +1682,8 @@ pub struct Config { | |||||||
| pub custom_rpc_generator: RpcGeneratorFunction, | ||||||||
| pub custom_includes: Vec<String>, | ||||||||
| pub owned: bool, | ||||||||
| pub nostd: bool, | ||||||||
| pub hashbrown: bool, | ||||||||
| } | ||||||||
|
|
||||||||
| #[derive(Debug, Default, Clone)] | ||||||||
|
|
@@ -2153,33 +2179,58 @@ impl FileDescriptor { | |||||||
| )?; | ||||||||
| return Ok(()); | ||||||||
| } | ||||||||
|
|
||||||||
| if config.nostd { | ||||||||
| writeln!(w, "use alloc::vec::Vec;")?; | ||||||||
| } | ||||||||
|
|
||||||||
| if self.messages.iter().any(|m| { | ||||||||
| m.all_fields() | ||||||||
| .any(|f| (f.typ.has_cow() || (f.packed() && f.typ.is_fixed_size()))) | ||||||||
| }) { | ||||||||
| if config.nostd { | ||||||||
| writeln!(w, "use alloc::borrow::Cow;")?; | ||||||||
| } else { | ||||||||
| writeln!(w, "use std::borrow::Cow;")?; | ||||||||
| } | ||||||||
| } | ||||||||
| if config.nostd | ||||||||
| && self.messages.iter().any(|m| { | ||||||||
| self.owned && m.has_lifetime(&self, &mut Vec::new()) | ||||||||
| || m.all_fields().any(|f| f.boxed) | ||||||||
| }) | ||||||||
| { | ||||||||
| writeln!(w)?; | ||||||||
| writeln!(w, "use alloc::boxed::Box;")?; | ||||||||
| } | ||||||||
| if self | ||||||||
| .messages | ||||||||
| .iter() | ||||||||
| .any(|m| m.all_fields().any(|f| f.typ.is_map())) | ||||||||
| { | ||||||||
| if config.hashbrown { | ||||||||
| writeln!(w, "use hashbrown::HashMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = HashMap<K, V>;")?; | ||||||||
| } else if config.nostd { | ||||||||
| writeln!(w, "use alloc::collections::BTreeMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = BTreeMap<K, V>;")?; | ||||||||
| } else { | ||||||||
| writeln!(w, "use std::collections::HashMap;")?; | ||||||||
| writeln!(w, "type KVMap<K, V> = HashMap<K, V>;")?; | ||||||||
| } | ||||||||
| } | ||||||||
| writeln!( | ||||||||
| w, | ||||||||
| "use quick_protobuf::{{MessageRead, MessageWrite, BytesReader, Writer, WriterBackend, Result}};" | ||||||||
| )?; | ||||||||
|
|
||||||||
| if self.owned { | ||||||||
| write!( | ||||||||
| w, | ||||||||
| "\ | ||||||||
| use core::convert::TryFrom;\n\ | ||||||||
| use core::ops::Deref;\n\ | ||||||||
| use core::ops::DerefMut;\n\ | ||||||||
| " | ||||||||
| )?; | ||||||||
| } | ||||||||
|
|
||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe most people won't use no_std and they'd rather use regular
std::HashMap.I understand that the distinction is done at import time but I'd like things to be as simple as possible for std users.