diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-17 17:23:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-17 17:23:50 +0000 |
commit | 0f91b48f780b54f15e39f8892d187d24d3b04f4c (patch) | |
tree | 2b233959d3883a8dc027030b9cbcfb61ecc43301 | |
parent | aabe3fdbf524a61259eef45e4803ef52e9d05134 (diff) | |
parent | c2a5a625301f264140828b3a88240de4362fc995 (diff) | |
download | pest_generator-android14-d2-s1-release.tar.gz |
Upgrade pest_generator to 2.5.5 am: 2e36314e24 am: 69662c3e5d am: c2a5a62530android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pest_generator/+/2441180
Change-Id: Ic5fa5394f7820a54830d890469b47b60ee48fb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 6 | ||||
-rw-r--r-- | Cargo.toml.orig | 6 | ||||
-rw-r--r-- | METADATA | 6 | ||||
-rw-r--r-- | src/docs.rs | 6 | ||||
-rw-r--r-- | src/lib.rs | 7 | ||||
-rw-r--r-- | tests/test.pest | 7 |
7 files changed, 22 insertions, 18 deletions
@@ -43,7 +43,7 @@ rust_library_host { name: "libpest_generator", crate_name: "pest_generator", cargo_env_compat: true, - cargo_pkg_version: "2.5.4", + cargo_pkg_version: "2.5.5", srcs: ["src/lib.rs"], edition: "2021", features: [ @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.56" name = "pest_generator" -version = "2.5.4" +version = "2.5.5" authors = ["DragoČ™ Tiselice <dragostiselice@gmail.com>"] description = "pest code generator" homepage = "https://pest.rs/" @@ -28,11 +28,11 @@ license = "MIT/Apache-2.0" repository = "https://github.com/pest-parser/pest" [dependencies.pest] -version = "2.5.4" +version = "2.5.5" default-features = false [dependencies.pest_meta] -version = "2.5.4" +version = "2.5.5" [dependencies.proc-macro2] version = "1.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index df4b4da..ab98cb2 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "pest_generator" description = "pest code generator" -version = "2.5.4" +version = "2.5.5" edition = "2021" authors = ["DragoČ™ Tiselice <dragostiselice@gmail.com>"] homepage = "https://pest.rs/" @@ -18,8 +18,8 @@ default = ["std"] std = ["pest/std"] [dependencies] -pest = { path = "../pest", version = "2.5.4", default-features = false } -pest_meta = { path = "../meta", version = "2.5.4" } +pest = { path = "../pest", version = "2.5.5", default-features = false } +pest_meta = { path = "../meta", version = "2.5.5" } proc-macro2 = "1.0" quote = "1.0" syn = "1.0" @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/pest_generator/pest_generator-2.5.4.crate" + value: "https://static.crates.io/crates/pest_generator/pest_generator-2.5.5.crate" } - version: "2.5.4" + version: "2.5.5" license_type: NOTICE last_upgrade_date { year: 2023 month: 2 - day: 3 + day: 16 } } diff --git a/src/docs.rs b/src/docs.rs index 8660e53..f1ce188 100644 --- a/src/docs.rs +++ b/src/docs.rs @@ -106,16 +106,16 @@ mod tests { expected.insert("foo".to_owned(), "Matches foo str, e.g.: `foo`".to_owned()); expected.insert( "bar".to_owned(), - "Matches bar str,\n Indent 2, e.g: `bar` or `foobar`".to_owned(), + "Matches bar str\n\n Indent 2, e.g: `bar` or `foobar`".to_owned(), ); expected.insert( "dar".to_owned(), - "Matches dar\nMatch dar description".to_owned(), + "Matches dar\n\nMatch dar description\n".to_owned(), ); assert_eq!(expected, doc_comment.line_docs); assert_eq!( - "A parser for JSON file.\nAnd this is a example for JSON parser.\n\n indent-4-space", + "A parser for JSON file.\nAnd this is a example for JSON parser.\n\n indent-4-space\n", doc_comment.grammar_doc ); } @@ -236,6 +236,7 @@ mod tests { parse_derive(ast); } + #[doc = "Matches dar\n\nMatch dar description\n"] #[test] fn test_generate_doc() { let input = quote! { @@ -247,17 +248,17 @@ mod tests { let token = super::derive_parser(input, true); let expected = quote! { - #[doc = "A parser for JSON file.\nAnd this is a example for JSON parser.\n\n indent-4-space"] + #[doc = "A parser for JSON file.\nAnd this is a example for JSON parser.\n\n indent-4-space\n"] #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)] #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] pub enum Rule { #[doc = "Matches foo str, e.g.: `foo`"] r#foo, - #[doc = "Matches bar str,\n Indent 2, e.g: `bar` or `foobar`"] + #[doc = "Matches bar str\n\n Indent 2, e.g: `bar` or `foobar`"] r#bar, r#bar1, - #[doc = "Matches dar\nMatch dar description"] + #[doc = "Matches dar\n\nMatch dar description\n"] r#dar } }; diff --git a/tests/test.pest b/tests/test.pest index c86a65f..95d484e 100644 --- a/tests/test.pest +++ b/tests/test.pest @@ -2,11 +2,13 @@ //! And this is a example for JSON parser. //! //! indent-4-space +//! /// Matches foo str, e.g.: `foo` foo = { "foo" } -/// Matches bar str, +/// Matches bar str +/// /// Indent 2, e.g: `bar` or `foobar` bar = { "bar" | "foobar" } @@ -14,7 +16,8 @@ bar = { "bar" | "foobar" } bar1 = { "bar1" } /// Matches dar - +/// /// Match dar description +/// dar = { "da" }
\ No newline at end of file |