Add explicit_reexport_of_matching_names test case.

.github/workflows/ci.yml

@@ -38,31 +38,31 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
 
       - name: cargo clippy
         uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --all-features --all-targets -- -D warnings --allow deprecated
+          args: --workspace --all-features --all-targets -- -D warnings -Dclippy::print_stdout -Dclippy::print_stderr -Dclippy::dbg_macro --allow deprecated
 
       - name: cargo fmt
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: -- --check
 
+      - name: cargo doc
+        env:
+          RUSTDOCFLAGS: -D warnings
+        run: cargo doc --workspace --all-features --no-deps --document-private-items
+
   rust-tests:
     name: Run tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain: ["1.67"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -72,18 +72,14 @@ jobs:
       - name: Install rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: ${{ matrix.toolchain }}
           profile: minimal
+          override: true
 
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Regenerate test data
+        run: ./scripts/regenerate_test_rustdocs.sh +${{ matrix.toolchain }}
 
       - name: compile
         run: cargo test --no-run

.gitignore

@@ -1,9 +1,15 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+**/target/
 
 # Local configuration for the project.
 .cargo/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# local-only data
+localdata/
+
+# lockfiles of test crates
+test_crates/**/Cargo.lock

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trustfall-rustdoc-adapter"
-version = "23.0.0"
+version = "23.2.1"
 edition = "2021"
 authors = ["Predrag Gruevski <obi1kenobi82@gmail.com>"]
 license = "Apache-2.0 OR MIT"
@@ -11,9 +11,12 @@ readme = "./README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-trustfall_core = "0.1.1"
+trustfall = "0.3.4"
 rustdoc-types = "0.19.0"
 
 [dev-dependencies]
+anyhow = "1.0.58"
+itertools = "0.10.5"
 serde_json = "1.0.85"
 serde = { version = "1.0.145", features = ["derive"] }
+maplit = "1.0.2"

scripts/get_current_version.sh

@@ -13,6 +13,6 @@ cd "$(git rev-parse --show-toplevel)"
 # The first argument should be the name of a crate.
 CRATE_NAME="$1"
 
-cargo metadata --format-version 1 | \
+cargo metadata --no-deps --format-version 1 | \
     jq --arg crate_name "$CRATE_NAME" --exit-status -r \
         '.packages[] | select(.name == $crate_name) | .version'

scripts/regenerate_test_rustdocs.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# Fail on first error, on undefined variables, and on failures in pipelines.
+set -euo pipefail
+
+export CARGO_TARGET_DIR=/tmp/test_crates
+RUSTDOC_OUTPUT_DIR="$CARGO_TARGET_DIR/doc"
+TOPLEVEL="$(git rev-parse --show-toplevel)"
+TARGET_DIR="$TOPLEVEL/localdata/test_data"
+
+# Allow setting an explicit toolchain, like +nightly or +beta.
+set +u
+TOOLCHAIN="$1"
+set -u
+echo "Generating rustdoc with: $(cargo $TOOLCHAIN --version)"
+RUSTDOC_CMD="cargo $TOOLCHAIN rustdoc"
+
+# Run rustdoc on test_crates/*/
+for crate_path in $(find "$TOPLEVEL/test_crates/" -maxdepth 1 -mindepth 1 -type d); do
+    # Removing path prefix, leaving only the directory name without forward slashes
+    crate=${crate_path#"$TOPLEVEL/test_crates/"}
+
+    if [[ -f "$TOPLEVEL/test_crates/$crate/Cargo.toml" ]]; then
+        echo "Generating: $crate"
+
+        pushd "$TOPLEVEL/test_crates/$crate"
+        RUSTC_BOOTSTRAP=1 $RUSTDOC_CMD -- -Zunstable-options --document-private-items --document-hidden-items --output-format=json
+        mkdir -p "$TARGET_DIR/$crate"
+        mv "$RUSTDOC_OUTPUT_DIR/$crate.json" "$TARGET_DIR/$crate/rustdoc.json"
+        popd
+    fi
+done
+
+unset CARGO_TARGET_DIR