diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2024-02-08 06:55:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-08 06:55:56 +0000 |
commit | 521b2b9d4f2bd47fd2525ea95afdd563152bda5c (patch) | |
tree | b89e7eb41f54bd313f199b556202e3890e038cd6 | |
parent | 51f5a86cbdbd003c15ae9c2806dede63116705bc (diff) | |
parent | 5cb8f80df11ead243dcfc05c506c4bc173a13d67 (diff) | |
download | rustversion-main.tar.gz |
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustversion/+/2953000
Change-Id: I4b273c4c0291fa40fe6e125d9e165ff1dab368f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | .clippy.toml | 1 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 5 | ||||
-rw-r--r-- | METADATA | 25 | ||||
-rw-r--r-- | src/lib.rs | 2 |
8 files changed, 21 insertions, 33 deletions
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 @@ -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, @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.31" name = "rustversion" -version = "1.0.12" +version = "1.0.14" authors = ["David Tolnay <dtolnay@gmail.com>"] 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 <dtolnay@gmail.com>"] 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"] @@ -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" } } @@ -145,7 +145,7 @@ //! //! <br> -#![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, |