Skip to content

Commit

Permalink
Start development of 0.4: Remove sql code generator, bump dependencie…
Browse files Browse the repository at this point in the history
…s slightly
  • Loading branch information
kellerkindt committed Jan 16, 2024
1 parent 7b54bde commit 52715f9
Show file tree
Hide file tree
Showing 22 changed files with 97 additions and 4,338 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,36 +53,6 @@ jobs:
command: test
args: --features protobuf

test-psql:
name: Test Suite (psql)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- uses: actions-rs/cargo@v1
with:
command: test
args: --features psql

test-async-psql:
name: Test Suite (async-psql)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- uses: actions-rs/cargo@v1
with:
command: test
args: --features async-psql

test-all:
name: Test Suite (all)
runs-on: ubuntu-latest
Expand Down
25 changes: 7 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "asn1rs"
version = "0.3.1"
version = "0.4.0"
authors = ["Michael Watzko <[email protected]>"]
edition = "2018"
description = "ASN.1 to Rust, Protobuf and SQL compiler/code generator. Supports ASN.1 UPER"
keywords = ["asn1", "uper", "protobuf", "sql", "compiler"]
edition = "2021"
description = "ASN.1 to Rust compiler with Protobuf code generator. Supports ASN.1 UPER"
keywords = ["asn1", "uper", "protobuf", "compiler"]
categories = ["encoding", "parsing"]
repository = "https://github.com/kellerkindt/asn1rs"
license = "MIT/Apache-2.0"
Expand All @@ -28,34 +28,23 @@ required-features = ["model"]

[dependencies]
backtrace = "0.3.9"
clap = "2.32.0"
codegen = "0.1.1"
clap = "2.34.0"
codegen = "0.1.3"
byteorder = "1.2.4"
serde = "1.0.115"
serde_derive = "1.0.115"

# feature postgres
postgres = { version = "0.19.1", optional = true }

# feature async-psql
tokio = { version = "1.8.1", optional = true, features = ["macros"] }
tokio-postgres = { version = "0.7.2", optional = true }
futures = { version = "0.3.4", optional = true }
bytes = { version = "1.0", optional = true }

# feature asn1rs-*
asn1rs-model = { version = "0.3.0", path = "asn1rs-model", optional = true }
asn1rs-macros = { version = "0.3.1", path = "asn1rs-macros", optional = true }

[dev-dependencies]
syn = {version = "1.0.109", features = ["full", "visit", "extra-traits"] }
syn = { version = "1.0.109", features = ["full", "visit", "extra-traits"] }
quote = "1.0.3"
proc-macro2 = "1.0.10"

[features]
default = ["macros", "model"]
psql = ["asn1rs-model/psql", "postgres", "bytes"]
async-psql = ["asn1rs-model/async-psql", "tokio", "tokio-postgres", "futures", "bytes"]
protobuf = ["asn1rs-model/protobuf"]
macros = ["asn1rs-macros"]
model = ["asn1rs-model"]
Expand Down
253 changes: 78 additions & 175 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion asn1rs-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.3.1"
authors = ["Michael Watzko <[email protected]>"]
edition = "2018"
description = "Macros for asn1rs"
keywords = ["proc", "macro", "asn1", "protobuf", "sql"]
keywords = ["proc", "macro", "asn1", "protobuf"]
categories = ["parsing"]
repository = "https://github.com/kellerkindt/asn1rs-proc"
license = "MIT/Apache-2.0"
Expand Down
7 changes: 2 additions & 5 deletions asn1rs-model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name = "asn1rs-model"
version = "0.3.0"
authors = ["Michael Watzko <[email protected]>"]
edition = "2018"
description = "Rust, Protobuf and SQL model definitions for asn1rs"
keywords = ["asn1", "protobuf", "sql", "model"]
description = "Rust and Protobuf model definitions for asn1rs"
keywords = ["asn1", "protobuf", "model"]
categories = ["parsing"]
repository = "https://github.com/kellerkindt/asn1rs"
license = "MIT/Apache-2.0"
Expand All @@ -21,9 +21,6 @@ strum_macros = "0.19.2"

[features]
default = []
# RustCodeGenerator -> GeneratorSupplement
psql = []
async-psql = []
protobuf = []
debug-proc-macro = []
generate-internal-docs = []
1 change: 0 additions & 1 deletion asn1rs-model/src/gen/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pub mod protobuf;
pub mod rust;
pub mod sql;

pub use self::rust::RustCodeGenerator;

Expand Down
Loading

0 comments on commit 52715f9

Please sign in to comment.