Switch to monorepo with workspaces

Tests and documentation that are out-of-sync due to a split repo
make life unreasonably difficult when it can all just be in the
same repo.

Author: csnover

Cargo.toml

@@ -1,22 +1,5 @@
-[package]
-name = "binread"
-version = "1.4.1"
-authors = ["jam1garner <[email protected]>"]
-edition = "2018"
-repository = "https://github.com/jam1garner/binread"
-license = "MIT"
-description = "A Rust crate for helping read structs from binary data using ✨macro magic✨"
-readme = "README.md"
-documentation = "https://docs.rs/binread"
-
-[dependencies]
-binread_derive = { version = "1.4", path = "../binread_derive" }
-lazy_static = { version = "1.4" , optional=true }
-
-[dev-dependencies]
-modular-bitfield = "0.9"
-
-[features]
-default = ["std"]
-std = []
-debug_template = ["std", "lazy_static", "binread_derive/debug_template"]
+[workspace]
+members = [
+    "binread",
+    "binread_derive"
+]

binread/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "binread"
+version = "1.4.1"
+authors = ["jam1garner <[email protected]>"]
+edition = "2018"
+repository = "https://github.com/jam1garner/binread"
+license = "MIT"
+description = "A Rust crate for helping read structs from binary data using ✨macro magic✨"
+readme = "README.md"
+documentation = "https://docs.rs/binread"
+
+[dependencies]
+binread_derive = { version = "1.4", path = "../binread_derive" }
+lazy_static = { version = "1.4" , optional=true }
+
+[dev-dependencies]
+modular-bitfield = "0.9"
+
+[features]
+default = ["std"]
+std = []
+debug_template = ["std", "lazy_static", "binread_derive/debug_template"]

src/attribute.rs renamed to binread/src/attribute.rs

@@ -0,0 +1,19 @@
+[package]
+name = "binread_derive"
+version = "1.4.3"
+authors = ["jam1garner <[email protected]>"]
+edition = "2018"
+description = "Derive macro for binread"
+repository = "https://github.com/jam1garner/binread"
+license = "MIT"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "1", features = ["extra-traits", "full"] }
+quote = "1"
+proc-macro2 = "1"
+
+[features]
+debug_template = []

src/binary_template.rs renamed to binread/src/binary_template.rs

@@ -0,0 +1,19 @@
+/// An enum to represent the endianess to read
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Endian {
+    Big,
+    Little,
+    Native,
+}
+
+impl Into<String> for &Endian {
+    fn into(self) -> String {
+        String::from(
+            match self {
+                Endian::Big => "Big",
+                Endian::Little => "Little",
+                Endian::Native => "Native",
+            }
+        )
+    }
+}

src/binread_impls.rs renamed to binread/src/binread_impls.rs

@@ -0,0 +1,9 @@
+use proc_macro2::TokenStream;
+use super::TopLevelAttrs;
+use crate::CompileError;
+use syn::DeriveInput;
+use quote::quote;
+
+pub fn generate(_: &DeriveInput, _: &TopLevelAttrs) -> Result<TokenStream, CompileError> {
+    Ok(quote!{Ok(())})
+}

src/endian.rs renamed to binread/src/endian.rs

@@ -0,0 +1,9 @@
+use proc_macro2::TokenStream;
+use super::TopLevelAttrs;
+use crate::CompileError;
+
+/// Generate the argument type for the derived impl
+pub fn generate(tla: &TopLevelAttrs) -> Result<TokenStream, CompileError> {
+    Ok(tla.import.types())
+}
+

src/error.rs renamed to binread/src/error.rs

@@ -0,0 +1,44 @@
+pub(crate) mod sanitization;
+mod read_options;
+mod after_parse;
+mod arg_type;
+
+use proc_macro2::TokenStream;
+use crate::{
+    meta_attrs::TopLevelAttrs,
+    compiler_error::{CompileError, SpanError}
+};
+
+pub fn generate(input: &syn::DeriveInput) -> Result<GeneratedCode, CompileError> {
+    if let syn::Data::Union(ref union) = input.data {
+        SpanError::err(union.union_token.span, "Unions not supported")?
+    }
+
+    let tla = TopLevelAttrs::from_derive_input(input)?.finalize()?;
+
+    Ok(GeneratedCode {
+        arg_type: arg_type::generate(&tla)?,
+        read_opt_impl: read_options::generate(input, &tla)?,
+        after_parse_impl: after_parse::generate(input, &tla)?,
+    })
+}
+
+pub struct GeneratedCode {
+    pub read_opt_impl: TokenStream,
+    pub after_parse_impl: TokenStream,
+    pub arg_type: TokenStream
+}
+
+impl GeneratedCode {
+    pub fn new<T1, T2, T3>(read_opt_impl: T1, after_parse_impl: T2, arg_type: T3) -> Self
+        where T1: Into<TokenStream>,
+              T2: Into<TokenStream>,
+              T3: Into<TokenStream>
+    {
+        Self {
+            read_opt_impl: read_opt_impl.into(),
+            after_parse_impl: after_parse_impl.into(),
+            arg_type: arg_type.into()
+        }
+    }
+}