diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 589dd2fc..00000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Rust", - "image": "mcr.microsoft.com/devcontainers/rust:1-1-bookworm", - "features": { - "ghcr.io/lee-orr/rusty-dev-containers/cargo-binstall": {}, - "ghcr.io/guiyomh/features/just": {} - } -} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ba34b7f4..2b185d08 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,8 +13,10 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install Rust toolchain + run: rustup update --no-self-update stable - uses: Swatinem/rust-cache@v2 - name: Build run: cargo build --verbose @@ -23,8 +25,10 @@ jobs: render: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install Rust toolchain + run: rustup update --no-self-update stable - uses: extractions/setup-just@v1 - uses: Swatinem/rust-cache@v2 - name: Build release @@ -38,16 +42,18 @@ jobs: cargo-deny: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install Rust toolchain + run: rustup update --no-self-update stable - uses: EmbarkStudios/cargo-deny-action@v1 lint: # inspired by https://github.com/EmbarkStudios/rust-gpu/blob/main/.github/workflows/ci.yaml runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt, rust-src + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install Rust toolchain + run: rustup update --no-self-update stable - name: Install rust-toolchain # cargo version is a random command that forces the installation of rust-toolchain run: cargo version - name: cargo fetch diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index acef55d9..b448e144 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -1,5 +1,3 @@ -# Borrowed from https://github.com/rust-analyzer/rust-analyzer/blob/faaec86ff0cf10dbd822a7abbeb381b3b5578141/.github/workflows/rustdoc.yaml - name: rustdoc on: push: @@ -19,17 +17,16 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt, rust-src + - name: Install Rust toolchain + run: rustup update --no-self-update stable - name: Build Documentation run: cargo doc --all --no-deps - name: Deploy Docs - uses: peaceiris/actions-gh-pages@364c31d33bb99327c77b3a5438a83a357a6729ad # v3.4.0 + uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_branch: gh-pages diff --git a/clovers/src/bvh/build.rs b/clovers/src/bvh/build.rs index aa42e2e6..a584da2d 100644 --- a/clovers/src/bvh/build.rs +++ b/clovers/src/bvh/build.rs @@ -1,7 +1,7 @@ mod longest_axis_midpoint; mod surface_area_heuristic; -pub use longest_axis_midpoint::build as longest_axis_midpoint; -pub use surface_area_heuristic::build as surface_area_heuristic; +pub(crate) use longest_axis_midpoint::build as longest_axis_midpoint; +pub(crate) use surface_area_heuristic::build as surface_area_heuristic; // Internal use only pub(crate) mod utils;