Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for 2.0 of ni-fpga #3

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Generated by Cargo
# will have compiled files and executables
/target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk
66 changes: 5 additions & 61 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[workspace]
members = [
"example",
"lvbitfile2rust",
"lvbitfile2rust-cli",
"lvbitfile2rust-macros",
Expand Down
4 changes: 2 additions & 2 deletions lvbitfile2rust-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lvbitfile2rust-cli"
version = "0.1.1"
version = "0.2.0"
authors = ["Connor Worley <[email protected]>"]
edition = "2018"
license-file = "LICENSE.md"
Expand All @@ -10,4 +10,4 @@ repository = "https://github.com/first-rust-competition/lvbitfile2rust"

[dependencies]
anyhow = "1.0.32"
lvbitfile2rust = { version = "0.1.0", path = "../lvbitfile2rust" }
lvbitfile2rust = { version = "0.2.0", path = "../lvbitfile2rust" }
2 changes: 1 addition & 1 deletion lvbitfile2rust-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ use anyhow::Result;
fn main() -> Result<()> {
let mut args: Vec<String> = std::env::args().collect();
assert_eq!(args.len(), 2, "usage: lvbitfile2rust-cli <bitfile>");
println!("{}", lvbitfile2rust::codegen(args.remove(1))?);
println!("{}", lvbitfile2rust::codegen(args.remove(1), false)?);
Ok(())
}
4 changes: 2 additions & 2 deletions lvbitfile2rust-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lvbitfile2rust-macros"
version = "0.1.1"
version = "0.2.0"
authors = ["Connor Worley <[email protected]>"]
edition = "2018"
license-file = "LICENSE.md"
Expand All @@ -12,6 +12,6 @@ repository = "https://github.com/first-rust-competition/lvbitfile2rust"
proc-macro = true

[dependencies]
lvbitfile2rust = { version = "0.1.0", path = "../lvbitfile2rust" }
lvbitfile2rust = { version = "0.2.0", path = "../lvbitfile2rust" }
quote = "1.0.7"
syn = "1.0.23"
2 changes: 1 addition & 1 deletion lvbitfile2rust-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use quote::quote;
#[proc_macro]
pub fn lvbitfile2rust(item: TokenStream) -> TokenStream {
let input = syn::parse_macro_input!(item as syn::LitStr);
match lvbitfile2rust::codegen(input.value()) {
match lvbitfile2rust::codegen(input.value(), true) {
Ok(tokens) => tokens,
Err(e) => {
let err_string = e.to_string();
Expand Down
4 changes: 2 additions & 2 deletions lvbitfile2rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lvbitfile2rust"
version = "0.1.1"
version = "0.2.0"
authors = ["Connor Worley <[email protected]>"]
edition = "2018"
license-file = "LICENSE.md"
Expand All @@ -13,4 +13,4 @@ proc-macro2 = "1.0.19"
quote = "1.0.7"
roxmltree = "0.13.0"
syn = { version = "1.0.23", features = ["full"] }
thiserror = "1.0.20"
thiserror = "1.0.20"
Loading