Extend component list

amethyst · Jul 2, 2017 · 6524127 · 6524127
1 parent 7ed10df
commit 6524127
Show file tree

Hide file tree

Showing 24 changed files with 95 additions and 258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Generated by Cargo
 /target/
+/specs_derive/target/
 Cargo.lock
 
 # Generated by mdbook

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [package]
 name = "specs"
 version = "0.9.2"
@@ -27,6 +26,9 @@ exclude = ["bors.toml", ".travis.yml"]
 [badges]
 travis-ci = { repository = "slide-rs/specs" }
 
+[workspace]
+members = [ "specs_derive" ]
+
 [dependencies]
 atom = "0.3"
 fnv = "1.0"
@@ -46,13 +48,15 @@ common = ["futures"]
 serialize = ["serde", "serde_derive"]
 
 [dev-dependencies]
-cgmath =  { version = "0.14", features = ["eders"] }
+cgmath = { version = "0.14", features = ["eders"] }
 rand = "0.3"
 serde_json = "1.0"
+specs_derive = { path = "specs_derive", version = "0.1", features = ["serialize"] }
 
 [[example]]
 name = "common"
 required-features = ["common"]
 
-[workspace]
-members = [ "specs_derive" ]
+[[example]]
+name = "derive"
+required-features = ["serialize"]
diff --git a/specs/benches/parallel.rs → benches/parallel.rs b/specs/benches/parallel.rs → benches/parallel.rs
diff --git a/specs/benches/world.rs → benches/world.rs b/specs/benches/world.rs → benches/world.rs
diff --git a/specs/examples/basic.rs → examples/basic.rs b/specs/examples/basic.rs → examples/basic.rs
diff --git a/specs_derive/examples/derive.rs → examples/derive.rs b/specs_derive/examples/derive.rs → examples/derive.rs
@@ -54,7 +54,6 @@ fn main() {
     #[allow(dead_code)]
     struct SomeGroup {
         #[group(serialize)]
-        #[group(id = "5")]
         field1: Comp1,
 
         #[group(serialize)]

diff --git a/specs/examples/full.rs → examples/full.rs b/specs/examples/full.rs → examples/full.rs
diff --git a/specs/examples/serialize.rs → examples/serialize.rs b/specs/examples/serialize.rs → examples/serialize.rs
diff --git a/specs/.gitignore b/specs/.gitignore
diff --git a/specs/Cargo.toml b/specs/Cargo.toml
diff --git a/specs/README.md b/specs/README.md
diff --git a/specs_derive/Cargo.toml b/specs_derive/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Aceeri <[email protected]>"]
 proc-macro = true
 
 [dependencies]
-specs = { path = "../specs", version = "0.9.1" }
+specs = { path = "../", version = "0.9.2" }
 syn = "0.11.10"
 quote = "0.3.15"
 serde = { version = "1.0", optional = true }
@@ -19,3 +19,4 @@ serde_json = "1.0"
 [features]
 default = []
 serialize = ["serde", "specs/serialize"]
+