ascent wip

redbadger · Oct 27, 2024 · cab10c1 · cab10c1
1 parent b3a540a
commit cab10c1
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crux_cli/Cargo.toml b/crux_cli/Cargo.toml
@@ -15,6 +15,7 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow.workspace = true
+ascent = "0.7.0"
 clap = { version = "4.4.18", features = ["derive"] }
 console = "0.15.8"
 guppy = "0.17.4"

diff --git a/crux_cli/codegen.fish b/crux_cli/codegen.fish
@@ -3,9 +3,6 @@
 cargo build
 
 for d in ../examples/hello_world
-    echo ""
-    echo "---------------"
-    echo "Public API for $d"
     pushd $d
     ../../target/debug/crux codegen --lib shared
     popd

diff --git a/crux_cli/src/codegen/mod.rs b/crux_cli/src/codegen/mod.rs
@@ -17,10 +17,19 @@ pub async fn codegen(args: &CodegenArgs) -> Result<()> {
         bail!("Could not find workspace package with path {}", args.lib)
     };
 
-    let json_path = rustdoc_json::Builder::default()
-        .toolchain("nightly")
-        .manifest_path(lib.manifest_path())
-        .build()?;
+    // let json_path = rustdoc_json::Builder::default()
+    //     .toolchain("nightly")
+    //     .manifest_path(lib.manifest_path())
+    //     .build()?;
+    let json_path = lib
+        .manifest_path()
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .join("target")
+        .join("doc")
+        .join("shared.json");
 
     let crate_: Crate = spawn_blocking(move || -> Result<Crate> {
         let file = File::open(json_path)?;
@@ -29,9 +38,7 @@ pub async fn codegen(args: &CodegenArgs) -> Result<()> {
     })
     .await??;
 
-    println!("Parsing rustdoc JSON, version {}", crate_.format_version);
-    let out = parser::parse(&crate_)?;
-    println!("{}", out);
+    parser::parse(&crate_)?;
 
     Ok(())
 }