From 8cba4480a8b26b387f2f3829d8365c57a1ab4983 Mon Sep 17 00:00:00 2001 From: Kaur Kuut Date: Wed, 11 Dec 2024 11:55:30 +0200 Subject: [PATCH 1/2] Disable publishing of `tree_arena`. --- tree_arena/Cargo.toml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tree_arena/Cargo.toml b/tree_arena/Cargo.toml index 3b879ddd8..9ec5db1b1 100644 --- a/tree_arena/Cargo.toml +++ b/tree_arena/Cargo.toml @@ -1,27 +1,22 @@ [package] name = "tree_arena" version = "0.1.0" -description = "An arena allocated tree designed for Linebender" +description = "An arena allocated tree." keywords = ["arena", "tree"] -categories = ["gui"] +categories = ["algorithms", "data-structures"] edition.workspace = true -rust-version.workspace = true license.workspace = true repository.workspace = true homepage.workspace = true +rust-version.workspace = true +publish = false # Remove just before publishing [package.metadata.docs.rs] all-features = true # all features are enabled - this means that the generated docs are for the safe version # There are no platform specific docs. default-target = "x86_64-unknown-linux-gnu" targets = [] -# rustdoc-scrape-examples tracking issue https://github.com/rust-lang/rust/issues/88791 -# cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] # no examples yet - - -[dependencies] -hashbrown.workspace = true [features] # This crate contains two implementations of a tree for use in masonry, one safe and the other unsafe. @@ -33,3 +28,6 @@ safe_tree = [] [lints] workspace = true + +[dependencies] +hashbrown.workspace = true From 2d34ecdfb6fd292e4aa4671049d07a019947b56a Mon Sep 17 00:00:00 2001 From: Kaur Kuut Date: Wed, 11 Dec 2024 12:03:11 +0200 Subject: [PATCH 2/2] Run MSRV checks only on published packages. --- .github/workflows/ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1c396ee2..a25291cd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,6 @@ env: # Be sure to also update the rust-version property in the workspace Cargo.toml file, # plus all the README.md files of the affected packages. RUST_MIN_VER: "1.81" - # List of packages that will be checked with the minimum supported Rust version. - # This should be limited to packages that are intended for publishing. - RUST_MIN_VER_PKGS: "-p xilem -p xilem_core -p masonry" # List of packages that can not target Wasm. NO_WASM_PKGS: "--exclude masonry --exclude xilem" # Only some of our examples support Android (primarily due to extra required boilerplate). @@ -44,6 +41,7 @@ env: # # The MSRV jobs run only cargo check because different clippy versions can disagree on goals and # running tests introduces dev dependencies which may require a higher MSRV than the bare package. +# Checking is limited to packages that are intended for publishing to keep MSRV as low as possible. # # If the workspace uses debug_assertions then we verify code twice, with it set to true or false. # We always keep it true for external dependencies so that we can reuse the cache for faster builds. @@ -375,11 +373,11 @@ jobs: save-if: ${{ github.event_name != 'merge_group' }} - name: Run cargo check - run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} --locked --profile ci --optional-deps --each-feature + run: cargo hack check --workspace --ignore-private --locked --profile ci --optional-deps --each-feature - name: Run cargo check (no debug_assertions) if: env.USING_DEBUG_ASSERTIONS == 'true' - run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} --locked --profile ci --optional-deps --each-feature + run: cargo hack check --workspace --ignore-private --locked --profile ci --optional-deps --each-feature env: CARGO_PROFILE_CI_DEBUG_ASSERTIONS: "false" @@ -407,11 +405,11 @@ jobs: save-if: ${{ github.event_name != 'merge_group' }} - name: Run cargo check - run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature + run: cargo hack check --workspace --ignore-private ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature - name: Run cargo check (no debug_assertions) if: env.USING_DEBUG_ASSERTIONS == 'true' - run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature + run: cargo hack check --workspace --ignore-private ${{ env.NO_WASM_PKGS }} --locked --profile ci --target wasm32-unknown-unknown --optional-deps --each-feature env: CARGO_PROFILE_CI_DEBUG_ASSERTIONS: "false"