aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-08-13 01:15:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-13 01:15:45 +0000
commita98dcdf6682cc0b51d78e54deb9d9f53ca93f265 (patch)
treeee235a37547a0681dea215d0391d1c4db7c20f4d
parentdb09e9503460b31bff12ceb86d4d6a9fb8f025e6 (diff)
parent700d8a5b2f519996c78f0531ba2b60c8f506f40c (diff)
downloadnom-a98dcdf6682cc0b51d78e54deb9d9f53ca93f265.tar.gz
Upgrade rust/crates/nom to 6.2.1 am: 700d8a5b2f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nom/+/1791107 Change-Id: Iad9c6a6724a70fb1bdf0c4dc39de970585c85fdc
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Cargo.toml2
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA10
-rw-r--r--src/lib.rs4
5 files changed, 10 insertions, 10 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4a85459..fc0f2a7 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "47fb5d683632c6774b6213c01c9aa1b42e1b3e2e"
+ "sha1": "b7b7edb401edb49fd52a8ca09730c4f2d8d1910f"
}
}
diff --git a/Cargo.toml b/Cargo.toml
index 4d81557..ec03c01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "nom"
-version = "6.2.0"
+version = "6.2.1"
authors = ["contact@geoffroycouprie.com"]
include = ["CHANGELOG.md", "LICENSE", "README.md", ".gitignore", ".travis.yml", "Cargo.toml", "src/*.rs", "src/*/*.rs", "tests/*.rs", "doc/nom_recipes.md", "build.rs"]
autoexamples = false
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 223a87a..0cc06c7 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "nom"
-version = "6.2.0"
+version = "6.2.1"
authors = [ "contact@geoffroycouprie.com" ]
description = "A byte-oriented, zero-copy, parser combinators library"
license = "MIT"
diff --git a/METADATA b/METADATA
index 7a8bf59..c3f4a24 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/nom/nom-5.1.2.crate"
+ value: "https://static.crates.io/crates/nom/nom-6.2.1.crate"
}
- version: "5.1.2"
+ version: "6.2.1"
license_type: NOTICE
last_upgrade_date {
- year: 2020
- month: 10
- day: 26
+ year: 2021
+ month: 8
+ day: 9
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 52c65c6..c0eeb5d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -404,7 +404,7 @@
#![cfg_attr(feature = "cargo-clippy", allow(clippy::doc_markdown))]
#![cfg_attr(nightly, feature(test))]
#![cfg_attr(feature = "docsrs", feature(doc_cfg))]
-#![cfg_attr(feature = "docsrs", feature(external_doc))]
+#![cfg_attr(feature = "docsrs", feature(extended_key_value_attributes))]
#![deny(missing_docs)]
#![warn(missing_doc_code_examples)]
@@ -521,5 +521,5 @@ mod str;
pub mod number;
#[cfg(feature = "docsrs")]
-#[cfg_attr(feature = "docsrs", doc(include = "../doc/nom_recipes.md"))]
+#[cfg_attr(feature = "docsrs", cfg_attr(feature = "docsrs", doc = include_str!("../doc/nom_recipes.md")))]
pub mod recipes {}