Get everything building

Author: jamesmunns

ci.sh

@@ -33,17 +33,17 @@ cargo_test --features=alloc,experimental-derive,use-std,use-crc,derive,nalgebra-
 
 # NOTE: we exclude postcard-dyn for these checks because it is std-only
 
-cargo_check --target=thumbv7em-none-eabi --no-default-features --exclude postcard-dyn
-cargo_check --target=thumbv7em-none-eabi --features=alloc,experimental-derive --exclude postcard-dyn
+cargo_check --target=thumbv7em-none-eabi --no-default-features --exclude postcard-dyn --exclude postcard-dyn-ng
+cargo_check --target=thumbv7em-none-eabi --features=alloc,experimental-derive --exclude postcard-dyn --exclude postcard-dyn-ng
 
 # CC https://github.com/jamesmunns/postcard/issues/167 - don't accidentally use atomics
 # on non-atomic systems
-cargo_check --target=riscv32i-unknown-none-elf --features=alloc,experimental-derive --exclude postcard-dyn
+cargo_check --target=riscv32i-unknown-none-elf --features=alloc,experimental-derive --exclude postcard-dyn --exclude postcard-dyn-ng
 
 cargo fmt --all -- --check
 
 # Check docs.rs build
 #
 # TODO: We SHOULDN'T exclude postcard-dyn but it does weird things with feature unification and
 # makes the embedded-io stuff break
-env RUSTDOCFLAGS='--cfg=docsrs --deny=warnings' cargo +nightly doc --all --no-deps --all-features --exclude postcard-dyn
+env RUSTDOCFLAGS='--cfg=docsrs --deny=warnings' cargo +nightly doc --all --no-deps --all-features --exclude postcard-dyn --exclude postcard-dyn-ng

source/postcard-derive-ng/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postcard-derive-ng"
-version = "0.3"
+version = "0.3.0"
 authors = [
     "Lachlan Sneff <lachlan.sneff@gmail.com>",
     "James Munns <james@onevariable.com>",

source/postcard-dyn-ng/Cargo.toml

@@ -27,8 +27,7 @@ version = "1.0.10"
 features = ["use-std"]
 path = "../postcard"
 
-[dependencies.postcard-schema]
-package = "postcard-schema-ng"
+[dependencies.postcard-schema-ng]
 version = "0.3"
 features = ["use-std", "derive"]
 path = "../postcard-schema-ng"

source/postcard-dyn-ng/src/de.rs

@@ -1,6 +1,6 @@
 use std::str::from_utf8;
 
-use postcard_schema::schema::owned::{OwnedData, OwnedDataModelType};
+use postcard_schema_ng::schema::owned::{OwnedData, OwnedDataModelType};
 use serde_json::{Map, Number, Value};
 
 use crate::de::varint::de_zig_zag_i16;
@@ -453,7 +453,7 @@ impl TakeExt for [u8] {
 
 #[cfg(test)]
 mod test {
-    use postcard_schema::Schema;
+    use postcard_schema_ng::Schema;
     use serde::{Deserialize, Serialize};
     use serde_json::json;
 

source/postcard-dyn-ng/src/ser.rs

@@ -1,6 +1,6 @@
 use std::num::TryFromIntError;
 
-use postcard_schema::schema::owned::{OwnedData, OwnedDataModelType};
+use postcard_schema_ng::schema::owned::{OwnedData, OwnedDataModelType};
 use serde_json::Value;
 use varint::{
     varint_max, varint_u128, varint_u16, varint_u32, varint_u64, varint_usize, zig_zag_i128,
@@ -502,7 +502,7 @@ mod test {
     use serde_json::json;
 
     use crate::to_stdvec_dyn;
-    use postcard_schema::Schema;
+    use postcard_schema_ng::Schema;
 
     #[derive(Serialize, Deserialize, Schema)]
     struct UnitStruct;

source/postcard-schema-ng/Cargo.toml

@@ -65,9 +65,9 @@ version = "1.0"
 optional = true
 default-features = false
 
-[dependencies.postcard-derive]
-path = "../postcard-derive"
-version = "0.2.0"
+[dependencies.postcard-derive-ng]
+path = "../postcard-derive-ng"
+version = "0.3.0"
 optional = true
 
 [dependencies.defmt_v0_3]
@@ -95,7 +95,7 @@ features = ["serde-serialize-no-std"]
 default = []
 use-std = ["serde/std"]
 alloc = ["serde/alloc"]
-derive = ["postcard-derive"]
+derive = ["postcard-derive-ng"]
 
 core-net = []
 core-num-saturating = []

source/postcard-schema-ng/src/key/hash.rs

@@ -407,7 +407,7 @@ pub mod fnv1a64_owned {
 
 #[cfg(test)]
 mod test {
-    use postcard_derive::Schema;
+    use postcard_derive_ng::Schema;
 
     use super::fnv1a64::hash_ty_path;
 

source/postcard-schema-ng/src/lib.rs

@@ -12,7 +12,7 @@ pub mod schema;
 /// # Examples
 ///
 /// ```
-/// use postcard_schema::Schema;
+/// use postcard_schema_ng::Schema;
 ///
 /// #[derive(Schema)]
 /// struct Point {
@@ -30,8 +30,8 @@ pub mod schema;
 /// code. This is normally only applicable when invoking re-exported derives from a different crate.
 ///
 /// ```
-/// # use postcard_schema::Schema;
-/// use postcard_schema as reexported_postcard_schema;
+/// # use postcard_schema_ng::Schema;
+/// use postcard_schema_ng as reexported_postcard_schema;
 ///
 /// #[derive(Schema)]
 /// #[postcard(crate = reexported_postcard_schema)]
@@ -47,7 +47,7 @@ pub mod schema;
 /// deriving [`Schema`]. The default bounds are `T: Schema` for each type parameter `T`.
 ///
 /// ```
-/// # use postcard_schema::Schema;
+/// # use postcard_schema_ng::Schema;
 /// #[derive(Schema)]
 /// #[postcard(bound = "")]
 /// struct Foo<F: Bar, T: Schema>(F::Wrap<T>);
@@ -64,7 +64,7 @@ pub mod schema;
 /// Foo::<NoSchema, u8>::SCHEMA;
 /// ```
 #[cfg(feature = "derive")]
-pub use postcard_derive::Schema;
+pub use postcard_derive_ng::Schema;
 
 /// A trait that represents a compile time calculated schema
 pub trait Schema {

source/postcard-schema-ng/tests/schema.rs

@@ -1,4 +1,4 @@
-use postcard_schema::{
+use postcard_schema_ng::{
     schema::{owned::OwnedDataModelType, Data, DataModelType, NamedField, Variant},
     Schema,
 };