From 5cb8f80df11ead243dcfc05c506c4bc173a13d67 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Wed, 7 Feb 2024 21:23:49 +0100 Subject: Upgrade rustversion to 1.0.14 This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update external/rust/crates/rustversion For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Id7e00ca13efb323254303bd13261fcca9a8fb24d --- .cargo_vcs_info.json | 2 +- .clippy.toml | 1 - .github/workflows/ci.yml | 13 +------------ Android.bp | 2 +- Cargo.toml | 4 +++- Cargo.toml.orig | 5 +++-- METADATA | 25 +++++++++++-------------- src/lib.rs | 2 +- 8 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 .clippy.toml diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 6f0afbd..1a75a1c 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "a85f2db274e1367a945a83ed4fe5a7a53d8f4f0e" + "sha1": "7231250c8168f21103da4a99246ff485a109f8b4" }, "path_in_vcs": "" } \ No newline at end of file diff --git a/.clippy.toml b/.clippy.toml deleted file mode 100644 index 3d30690..0000000 --- a/.clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv = "1.31.0" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 748c2b7..3b40719 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,18 +47,6 @@ jobs: - uses: dtolnay/rust-toolchain@1.31.0 - run: cargo check - minimal: - name: Minimal versions - needs: pre_ci - if: needs.pre_ci.outputs.continue - runs-on: ubuntu-latest - timeout-minutes: 45 - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly - - run: cargo update -Z minimal-versions - - run: cargo test - clippy: name: Clippy runs-on: ubuntu-latest @@ -78,6 +66,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@miri + - run: cargo miri setup - run: cargo miri test env: MIRIFLAGS: -Zmiri-strict-provenance diff --git a/Android.bp b/Android.bp index 25f7a00..eea3b23 100644 --- a/Android.bp +++ b/Android.bp @@ -41,7 +41,7 @@ rust_proc_macro { name: "librustversion", crate_name: "rustversion", cargo_env_compat: true, - cargo_pkg_version: "1.0.12", + cargo_pkg_version: "1.0.14", srcs: ["src/lib.rs"], edition: "2018", product_available: true, diff --git a/Cargo.toml b/Cargo.toml index 073d230..6125165 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.31" name = "rustversion" -version = "1.0.12" +version = "1.0.14" authors = ["David Tolnay "] build = "build/build.rs" description = "Conditional compilation according to rustc compiler version" @@ -22,11 +22,13 @@ readme = "README.md" categories = [ "development-tools::build-utils", "no-std", + "no-std::no-alloc", ] license = "MIT OR Apache-2.0" repository = "https://github.com/dtolnay/rustversion" [package.metadata.docs.rs] +rustdoc-args = ["--generate-link-to-definition"] targets = ["x86_64-unknown-linux-gnu"] [lib] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 6f5c372..d12515c 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,9 +1,9 @@ [package] name = "rustversion" -version = "1.0.12" +version = "1.0.14" authors = ["David Tolnay "] build = "build/build.rs" -categories = ["development-tools::build-utils", "no-std"] +categories = ["development-tools::build-utils", "no-std", "no-std::no-alloc"] description = "Conditional compilation according to rustc compiler version" documentation = "https://docs.rs/rustversion" edition = "2018" @@ -19,3 +19,4 @@ trybuild = { version = "1.0.49", features = ["diff"] } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] +rustdoc-args = ["--generate-link-to-definition"] diff --git a/METADATA b/METADATA index 4dd08e7..9d4120c 100644 --- a/METADATA +++ b/METADATA @@ -1,23 +1,20 @@ # This project was upgraded with external_updater. -# Usage: tools/external_updater/updater.sh update rust/crates/rustversion -# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md +# Usage: tools/external_updater/updater.sh update external/rust/crates/rustversion +# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md name: "rustversion" description: "Conditional compilation according to rustc compiler version" third_party { - url { - type: HOMEPAGE - value: "https://crates.io/crates/rustversion" - } - url { - type: ARCHIVE - value: "https://static.crates.io/crates/rustversion/rustversion-1.0.12.crate" - } - version: "1.0.12" license_type: NOTICE last_upgrade_date { - year: 2023 - month: 4 - day: 3 + year: 2024 + month: 2 + day: 7 + } + homepage: "https://crates.io/crates/rustversion" + identifier { + type: "Archive" + value: "https://static.crates.io/crates/rustversion/rustversion-1.0.14.crate" + version: "1.0.14" } } diff --git a/src/lib.rs b/src/lib.rs index 1cc9e97..1bf0f1d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -145,7 +145,7 @@ //! //!
-#![doc(html_root_url = "https://docs.rs/rustversion/1.0.12")] +#![doc(html_root_url = "https://docs.rs/rustversion/1.0.14")] #![allow( clippy::cast_lossless, clippy::cast_possible_truncation, -- cgit v1.2.3