aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-03-30 22:01:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-30 22:01:36 +0000
commit9f4d7bbc1d6e29c98c61308dbb48812eeaf5bbe8 (patch)
treed2841168835ad0a1d999bc2d66ba1fc17eb27ccc
parent8a5876a8812978320915ef90c71c34dfc6594d49 (diff)
parent6cb13db86fe3a6e5ce9b111377c5c81bb47054be (diff)
downloadunicode-ident-android14-qpr1-s2-release.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-ident/+/2514756 Change-Id: I5ac50ee6e47e637216d51d98df3d21ec3ce912dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--.github/workflows/ci.yml11
-rw-r--r--Android.bp2
-rw-r--r--Cargo.toml5
-rw-r--r--Cargo.toml.orig5
-rw-r--r--LICENSE-APACHE25
-rw-r--r--METADATA8
-rw-r--r--src/lib.rs1
-rw-r--r--tests/static_size.rs2
9 files changed, 27 insertions, 34 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index e14fabf..295e0b8 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "25ba0d2e7a6f18d191a2801faa5b36fdb9026d1d"
+ "sha1": "c4f455414fdb61f354bbed176d27528b8d726391"
},
"path_in_vcs": ""
} \ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d6534c3..b74694e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ name: CI
on:
push:
pull_request:
+ workflow_dispatch:
schedule: [cron: "40 1 * * *"]
permissions:
@@ -12,6 +13,9 @@ env:
RUSTFLAGS: -Dwarnings
jobs:
+ pre_ci:
+ uses: dtolnay/.github/.github/workflows/pre_ci.yml@master
+
unicode:
name: latest Unicode
runs-on: ubuntu-latest
@@ -34,6 +38,8 @@ jobs:
test:
name: Rust ${{matrix.rust}}
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
strategy:
fail-fast: false
@@ -45,11 +51,16 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{matrix.rust}}
+ - name: Enable type layout randomization
+ run: echo RUSTFLAGS=${RUSTFLAGS}\ -Zrandomize-layout >> $GITHUB_ENV
+ if: matrix.rust == 'nightly'
- run: cargo test
- run: cargo check --benches
msrv:
name: Rust 1.31.0
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
diff --git a/Android.bp b/Android.bp
index d68a4f0..425b7bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,7 +43,7 @@ rust_library_host {
name: "libunicode_ident",
crate_name: "unicode_ident",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.6",
+ cargo_pkg_version: "1.0.8",
srcs: ["src/lib.rs"],
edition: "2018",
compile_multilib: "first",
diff --git a/Cargo.toml b/Cargo.toml
index 735a4ff..05687ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2018"
rust-version = "1.31"
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
authors = ["David Tolnay <dtolnay@gmail.com>"]
description = "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31"
documentation = "https://docs.rs/unicode-ident"
@@ -32,6 +32,9 @@ repository = "https://github.com/dtolnay/unicode-ident"
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
+[lib]
+doc-scrape-examples = false
+
[[bench]]
name = "xid"
harness = false
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index c5a5885..7f70f04 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["development-tools::procedural-macro-helpers", "no-std"]
description = "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31"
@@ -26,5 +26,8 @@ harness = false
[workspace]
members = ["diagram", "generate"]
+[lib]
+doc-scrape-examples = false
+
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
index 16fe87b..1b5ec8b 100644
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
@@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/METADATA b/METADATA
index d257607..5e99d8f 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate"
+ value: "https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.8.crate"
}
- version: "1.0.6"
+ version: "1.0.8"
license_type: NOTICE
last_upgrade_date {
year: 2023
- month: 2
- day: 6
+ month: 3
+ day: 30
}
}
diff --git a/src/lib.rs b/src/lib.rs
index f37ed52..1e566c9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -242,6 +242,7 @@
//! this data structure is straight-line code with no need for branching.
#![no_std]
+#![doc(html_root_url = "https://docs.rs/unicode-ident/1.0.8")]
#![allow(clippy::doc_markdown, clippy::must_use_candidate)]
#[rustfmt::skip]
diff --git a/tests/static_size.rs b/tests/static_size.rs
index 24effb4..610adf3 100644
--- a/tests/static_size.rs
+++ b/tests/static_size.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::unreadable_literal)]
+#![allow(clippy::let_underscore_untyped, clippy::unreadable_literal)]
use std::mem::size_of_val;