Make diffr 0.1.12 publishable on crates.io

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
         env:
           RELEASE_TAG: ${{ github.ref_type == 'tag' && github.ref_name || '' }}
         run: |
-          version=$(cargo metadata --no-deps --format-version 1 | "$PYTHON" -c 'import json, sys; print(next(p["version"] for p in json.load(sys.stdin)["packages"] if p["name"] == "diffr"), end="")')
+          version=$(cargo metadata --no-deps --format-version 1 | "$PYTHON" -c 'import json, sys; print(next(p["version"] for p in json.load(sys.stdin)["packages"] if p["name"] == "diffr-cli"), end="")')
           if [ -n "$RELEASE_TAG" ] && [ "$RELEASE_TAG" != "$version" ]; then
             echo "Tag $RELEASE_TAG does not match Cargo version $version" >&2
             exit 1

.github/workflows/test.yml

@@ -51,7 +51,17 @@
       shell: bash
       run: $BUILD_CMD test --target ${{ matrix.job.target }}
 
+  crate_packages:
+    name: Verify crates.io packages
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: dtolnay/rust-toolchain@1.99.0
+      # Build extracted archives together, with their internal dependencies
+      # staged locally instead of requiring them to be published already.
+      - run: cargo package --locked -p diffr-grammars -p diffr-core -p diffr-cli
+
   test_wasm_plugins:
     name: Test WASM component plugins
     runs-on: ubuntu-22.04
     steps:

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "diffr"
+name = "diffr-cli"
 description = "Structural diffs with a streaming API and interactive terminal frontend."
 repository = "https://github.com/devdotfast/diffr"
 homepage = "https://github.com/devdotfast/diffr"
@@ -15,12 +15,13 @@ rust-version = "1.99.0"
 include = [
         "/build.rs",
         "/src/",
-        "/crates/diffr-plugin-sdk/wit/",
+        "/wit/",
         "/plugins/",
         "/vendored_parsers/highlights/*.scm",
         "/vendored_parsers/*-src/**/*.c",
         "/vendored_parsers/*-src/**/*.h",
         "/LICENSE",
+        "/NOTICE",
         "/README.md",
 ]
 

crates/diffr-core/Cargo.toml

@@ -14,6 +14,18 @@ rust-version = "1.99.0"
 include = [
         "/build.rs",
         "/src/",
+        "/plugins/shape/**/plugin.toml",
+        "/plugins/shape/**/plugin.wasm",
+        "/plugins/shape/**/*.scm",
+        "/plugins/classify/plugin.toml",
+        "/plugins/classify/plugin.wasm",
+        "/licenses/",
+        "/vendored_parsers/highlights/*.scm",
+        "/examples/review/real/*/before.*",
+        "/examples/review/real/*/after.*",
+        "/examples/review/real/*/provenance.json",
+        "/LICENSE",
+        "/NOTICE",
 ]
 
 [dependencies]

crates/diffr-core/LICENSE

@@ -0,0 +1 @@
+../../LICENSE

crates/diffr-core/NOTICE

@@ -0,0 +1 @@
+../../NOTICE

crates/diffr-core/build.rs

@@ -11,7 +11,7 @@ use std::path::PathBuf;
 /// Embed the component, manifest and queries from every bundled shape plugin
 /// folder under `plugins/shape/`, and the classifier in `plugins/classify/`.
 fn main() {
-    let root = PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap()).join("../..");
+    let root = PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap());
     println!("cargo:rerun-if-changed={}", root.join("plugins").display());
     let mut files = String::from("const FILES: &[(&str, &str)] = &[\n");
     let mut components = String::from("const COMPONENTS: &[(&str, &[u8])] = &[\n");

crates/diffr-core/examples

@@ -0,0 +1 @@
+../../examples

crates/diffr-core/licenses/GitHub-Linguist

@@ -0,0 +1 @@
+../../../plugins/classify/rust/src/linguist/LICENSE

crates/diffr-core/plugins

@@ -0,0 +1 @@
+../../plugins

crates/diffr-core/src/parse/fold_tests.rs

@@ -214,8 +214,8 @@ mod folds {
 
     #[test]
     fn added_rust_test_body_is_foldable_without_hiding_signature_or_brace() {
-        let lhs = include_str!("../../../../examples/review/real/08-ripgrep-3496/before.rs");
-        let rhs = include_str!("../../../../examples/review/real/08-ripgrep-3496/after.rs");
+        let lhs = include_str!("../../examples/review/real/08-ripgrep-3496/before.rs");
+        let rhs = include_str!("../../examples/review/real/08-ripgrep-3496/after.rs");
         let review = DiffResult::from_sources("walk.rs", lhs, rhs);
         let signature = rhs
             .lines()
@@ -351,8 +351,8 @@ mod matcher {
 
     #[test]
     fn a_reindented_rename_target_stays_an_unchanged_token() {
-        let lhs = include_str!("../../../../examples/review/real/02-review-175/before.ts");
-        let rhs = include_str!("../../../../examples/review/real/02-review-175/after.ts");
+        let lhs = include_str!("../../examples/review/real/02-review-175/before.ts");
+        let rhs = include_str!("../../examples/review/real/02-review-175/after.ts");
         let review = DiffResult::from_sources("parser.ts", lhs, rhs);
         let token = review
             .lhs_positions
@@ -420,8 +420,7 @@ mod results {
 
     #[test]
     fn real_fixture_folds_have_valid_reciprocal_ranges() {
-        let root =
-            std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../examples/review/real");
+        let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("examples/review/real");
         for dir in std::fs::read_dir(root).unwrap() {
             let dir = dir.unwrap().path();
             let p: serde_json::Value =

crates/diffr-core/src/parse/tree_sitter_parser.rs

@@ -126,7 +126,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/ada.scm"),
+                    include_str!("../../vendored_parsers/highlights/ada.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -250,7 +250,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/cmake.scm"),
+                    include_str!("../../vendored_parsers/highlights/cmake.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -286,7 +286,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/c-sharp.scm"),
+                    include_str!("../../vendored_parsers/highlights/c-sharp.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -341,7 +341,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/devicetree.scm"),
+                    include_str!("../../vendored_parsers/highlights/devicetree.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -539,7 +539,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/hcl.scm"),
+                    include_str!("../../vendored_parsers/highlights/hcl.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -598,7 +598,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/janet_simple.scm"),
+                    include_str!("../../vendored_parsers/highlights/janet_simple.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -699,7 +699,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/julia.scm"),
+                    include_str!("../../vendored_parsers/highlights/julia.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -727,7 +727,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/kotlin.scm"),
+                    include_str!("../../vendored_parsers/highlights/kotlin.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -742,7 +742,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/latex.scm"),
+                    include_str!("../../vendored_parsers/highlights/latex.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -793,7 +793,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/newick.scm"),
+                    include_str!("../../vendored_parsers/highlights/newick.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -872,7 +872,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/pascal.scm"),
+                    include_str!("../../vendored_parsers/highlights/pascal.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -926,7 +926,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/proto.scm"),
+                    include_str!("../../vendored_parsers/highlights/proto.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],
@@ -1100,7 +1100,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 ignore_trailing_tokens: vec![],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/smali.scm"),
+                    include_str!("../../vendored_parsers/highlights/smali.scm"),
                 )
                 .unwrap(),
                 sub_languages: Vec::new(),
@@ -1250,7 +1250,7 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 delimiter_tokens: vec![("(", ")"), ("[", "]"), ("begin", "end")],
                 highlight_query: ts::Query::new(
                     &language,
-                    include_str!("../../../../vendored_parsers/highlights/verilog.scm"),
+                    include_str!("../../vendored_parsers/highlights/verilog.scm"),
                 )
                 .unwrap(),
                 sub_languages: vec![],

crates/diffr-core/src/plugin/builtin.rs

@@ -69,7 +69,7 @@ mod tests {
 
     #[test]
     fn every_plugin_folder_is_embedded_and_described() {
-        let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../plugins/shape");
+        let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("plugins/shape");
         let mut on_disk = BTreeSet::new();
         let mut folders = BTreeSet::new();
         for folder in std::fs::read_dir(&root).unwrap() {

crates/diffr-core/vendored_parsers

@@ -0,0 +1 @@
+../../vendored_parsers