fix merge

This commit is contained in:
Adam H. Leventhal 2023-04-25 22:23:57 -07:00
parent 24862f92e0
commit 632cfeb81f
3 changed files with 7 additions and 1 deletions

2
Cargo.lock generated
View File

@ -519,11 +519,13 @@ version = "0.1.0"
dependencies = [ dependencies = [
"base64", "base64",
"chrono", "chrono",
"prettyplease",
"progenitor", "progenitor",
"progenitor-client", "progenitor-client",
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
"syn 1.0.109",
"uuid", "uuid",
"wasm-bindgen-test", "wasm-bindgen-test",
] ]

View File

@ -15,5 +15,7 @@ uuid = { version = "1.3", features = ["serde", "v4", "js"] }
wasm-bindgen-test = "0.3.34" wasm-bindgen-test = "0.3.34"
[build-dependencies] [build-dependencies]
prettyplease = "0.1.25"
progenitor = { path = "../progenitor" } progenitor = { path = "../progenitor" }
serde_json = "1.0" serde_json = "1.0"
syn = "1.0"

View File

@ -13,7 +13,9 @@ fn main() {
let spec = serde_json::from_reader(file).unwrap(); let spec = serde_json::from_reader(file).unwrap();
let mut generator = progenitor::Generator::default(); let mut generator = progenitor::Generator::default();
let content = generator.generate_text(&spec).unwrap(); let tokens = generator.generate_tokens(&spec).unwrap();
let ast = syn::parse2(tokens).unwrap();
let content = prettyplease::unparse(&ast);
let mut out_file = Path::new(&env::var("OUT_DIR").unwrap()).to_path_buf(); let mut out_file = Path::new(&env::var("OUT_DIR").unwrap()).to_path_buf();
out_file.push("codegen.rs"); out_file.push("codegen.rs");