Skip to content

Commit

Permalink
chore: release 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dark-flames committed Jan 6, 2021
1 parent 00c2454 commit 08f869c
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features
args: --all-features --workspace
2 changes: 1 addition & 1 deletion .rusty-hook.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[hooks]
pre-commit = "cargo clippy -- -D warnings"
pre-push = "cargo check & cargo test --all-features"
pre-push = "cargo check & cargo test --all-features --workspace"

[logging]
verbose = true
14 changes: 3 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ description = "Compile-time annotation parser for rust"
repository = "https://github.com/dark-flames/annotation-rs"
keywords = ["annotation"]
include = [
"src/**",
"derive/**",
"helpers/**",
"tests/**",
"LICENSE-APACHE",
"LICENSE-MIT",
"/src/**",
"/LICENSE-APACHE",
"/LICENSE-MIT",
"/Cargo.toml",
"/README.md",
]
Expand All @@ -24,11 +21,6 @@ derive = { package = "annotation-rs-codegen", path = "./derive", version = "0.1.
helpers = { package = "annotation-rs-helpers", path = "./helpers", version = "0.1.0" }
syn = "1.0"

[dev-dependencies]
objects = { package = "annotations-test-objects", path = "tests/objects", version = "0.1.0" }
macros = { package = "annotation-rs-test-macros", path = "tests/macros", version = "0.1.0" }
float-cmp = "0.8.0"


[features]
annotation_reader=[]
Expand Down
11 changes: 10 additions & 1 deletion derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@ name = "annotation-rs-codegen"
version = "0.1.0"
authors = ["dark-flames <dark_flames@outlook.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
description = "proc-macro lib for annotation-rs"
repository = "https://github.com/dark-flames/annotation-rs"
include = [
"/src/**",
"/LICENSE-APACHE",
"/LICENSE-MIT",
"/Cargo.toml",
"/README.md",
]
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
helpers = { package = "annotation-rs-helpers", path = "../helpers" }
helpers = { package = "annotation-rs-helpers", path = "../helpers", version = "0.1.0" }
quote = "1.0"
proc-macro2 = "1.0"
heck = "0.3.1"
Expand Down
1 change: 0 additions & 1 deletion derive/crates-io.md

This file was deleted.

9 changes: 9 additions & 0 deletions helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@ name = "annotation-rs-helpers"
version = "0.1.0"
authors = ["dark-flames <dark_flames@outlook.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
description = "internal helper lib for annotation-rs"
repository = "https://github.com/dark-flames/annotation-rs"
include = [
"/src/**",
"/LICENSE-APACHE",
"/LICENSE-MIT",
"/Cargo.toml",
"/README.md",
]
readme = "README.md"

[dependencies]
syn = "1.0"
Expand Down
1 change: 0 additions & 1 deletion helpers/crates-io.md

This file was deleted.

16 changes: 13 additions & 3 deletions tests/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,28 @@ name = "annotation-rs-test-macros"
version = "0.1.0"
authors = ["dark-flames <dark_flames@outlook.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
description = "test macros for annotation-rs"
repository = "https://github.com/dark-flames/annotation-rs"
include = [
"/src/**",
"/LICENSE-APACHE",
"/LICENSE-MIT",
"/Cargo.toml",
"/README.md",
]
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
syn = "1.0"
proc-macro2 = "1.0"
quote = "1.0"
objects = { package = "annotations-test-objects", path = "../objects" }
derive = { package = "annotation-rs-codegen", path = "../../derive" }
annotation-rs = { path = "../../"}
objects = { package = "annotation-test-objects", path = "../objects", version = "0.1.0" }
derive = { package = "annotation-rs-codegen", path = "../../derive", version = "0.1" }
annotation-rs = { path = "../../", version = "0.1.0", features = ["annotation_reader"]}
float-cmp = "0.8.0"

[lib]
proc-macro = true
1 change: 0 additions & 1 deletion tests/macros/LICENSE-APACHE

This file was deleted.

1 change: 1 addition & 0 deletions tests/macros/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./LICENSE-APACHE
1 change: 0 additions & 1 deletion tests/macros/LICENSE-MIT

This file was deleted.

1 change: 1 addition & 0 deletions tests/macros/LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./LICENSE-MIT
1 change: 0 additions & 1 deletion tests/macros/README.md

This file was deleted.

1 change: 1 addition & 0 deletions tests/macros/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./README.md
5 changes: 1 addition & 4 deletions tests/full_test.rs → tests/macros/tests/full_test.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#![feature(proc_macro_hygiene)]
#[cfg(any(feature = "annotation_reader"))]
use annotation_rs::get_annotation;

use annotation_rs_test_macros::FullDerive;
use float_cmp::approx_eq;
use macros::FullDerive;
use objects::attributes::Full;
use objects::enums::TestEnum;

#[cfg(any(feature = "annotation_reader"))]
#[derive(FullDerive)]
#[Full(
object(i32 = 1, u16 = 2, float = 1.1, string = "test", enum2 = "aaa"),
Expand All @@ -18,7 +16,6 @@ use objects::enums::TestEnum;
)]
struct Test;

#[cfg(any(feature = "annotation_reader"))]
#[test]
pub fn test_full() {
let attr: Full = get_annotation!(Test, Full).unwrap();
Expand Down
5 changes: 1 addition & 4 deletions tests/simple_test.rs → tests/macros/tests/simple_test.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
#![feature(proc_macro_hygiene)]
#[cfg(any(feature = "annotation_reader"))]
use annotation_rs::get_annotation;

use annotation_rs_test_macros::SimpleDerive;
use float_cmp::approx_eq;
use macros::SimpleDerive;
use objects::attributes::Simple;
use objects::enums::TestEnum;

#[cfg(any(feature = "annotation_reader"))]
#[derive(SimpleDerive)]
#[Simple(i32 = 1, u16 = 2, float = 1.1, string = "test", enum2 = "aaa")]
struct Test;

#[cfg(any(feature = "annotation_reader"))]
#[test]
pub fn simple_test() {
let attr: Simple = get_annotation!(Test, Simple).unwrap();
Expand Down
14 changes: 11 additions & 3 deletions tests/objects/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
[package]
name = "annotations-test-objects"
name = "annotation-test-objects"
version = "0.1.0"
authors = ["dark-flames <dark_flames@outlook.com>"]
license = "MIT OR Apache-2.0"
edition = "2018"
description = "test objects for annotation-rs"
repository = "https://github.com/dark-flames/annotation-rs"
include = [
"/src/**",
"/LICENSE-APACHE",
"/LICENSE-MIT",
"/Cargo.toml",
"/README.md",
]
readme = "README.md"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
syn = "1.0"
proc-macro2 = "1.0"
quote = "1.0"
derive = { package = "annotation-rs-codegen", path = "../../derive" }
annotation-rs = { path = "../../"}
derive = { package = "annotation-rs-codegen", path = "../../derive", version = "0.1" }
annotation-rs = { path = "../../", version = "0.1.0" }
1 change: 0 additions & 1 deletion tests/objects/LICENSE-APACHE

This file was deleted.

1 change: 1 addition & 0 deletions tests/objects/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./LICENSE-APACHE
1 change: 0 additions & 1 deletion tests/objects/LICENSE-MIT

This file was deleted.

1 change: 1 addition & 0 deletions tests/objects/LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./LICENSE-MIT
1 change: 0 additions & 1 deletion tests/objects/README.md

This file was deleted.

1 change: 1 addition & 0 deletions tests/objects/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./README.md

0 comments on commit 08f869c

Please sign in to comment.