Upgrade rust/crates/nom to 5.1.2
Test: make
Change-Id: I8fd768ab495f36cfd8210558f1bacea3cc210f78
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4da2d7c..11eb80a 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "b1d3950dfaa157aeea458b77dc1d50851184e23f"
+ "sha1": "7e16897f3862dc4187a794c58e54909458ff044a"
}
}
diff --git a/Cargo.toml b/Cargo.toml
index 91894a9..56bacd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,9 @@
[package]
edition = "2018"
name = "nom"
-version = "5.1.1"
+version = "5.1.2"
authors = ["contact@geoffroycouprie.com"]
-include = ["CHANGELOG.md", "LICENSE", ".gitignore", ".travis.yml", "Cargo.toml", "src/*.rs", "src/*/*.rs", "tests/*.rs", "build.rs"]
+include = ["CHANGELOG.md", "LICENSE", "README.md", ".gitignore", ".travis.yml", "Cargo.toml", "src/*.rs", "src/*/*.rs", "tests/*.rs", "build.rs"]
autoexamples = false
description = "A byte-oriented, zero-copy, parser combinators library"
documentation = "https://docs.rs/nom"
@@ -141,7 +141,7 @@
optional = true
[dependencies.lexical-core]
-version = "^0.6.0"
+version = ">= 0.6, < 0.8"
optional = true
[dependencies.memchr]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 65e1402..fafc6b3 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "nom"
-version = "5.1.1"
+version = "5.1.2"
authors = [ "contact@geoffroycouprie.com" ]
description = "A byte-oriented, zero-copy, parser combinators library"
license = "MIT"
@@ -16,6 +16,7 @@
include = [
"CHANGELOG.md",
"LICENSE",
+ "README.md",
".gitignore",
".travis.yml",
"Cargo.toml",
@@ -46,7 +47,7 @@
default-features = false
[dependencies.lexical-core]
-version = "^0.6.0"
+version = ">= 0.6, < 0.8"
optional = true
[dev-dependencies]
diff --git a/METADATA b/METADATA
index dad84e1..7a8bf59 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/nom/nom-5.1.1.crate"
+ value: "https://static.crates.io/crates/nom/nom-5.1.2.crate"
}
- version: "5.1.1"
+ version: "5.1.2"
license_type: NOTICE
last_upgrade_date {
year: 2020
- month: 3
- day: 31
+ month: 10
+ day: 26
}
}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a398317
--- /dev/null
+++ b/README.md
@@ -0,0 +1,300 @@
+# nom, eating data byte by byte
+
+[](LICENSE)
+[](https://gitter.im/Geal/nom?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://travis-ci.org/Geal/nom)
+[](https://coveralls.io/r/Geal/nom?branch=master)
+[](https://crates.io/crates/nom)
+[](#rust-version-requirements)
+
+nom is a parser combinators library written in Rust. Its goal is to provide tools
+to build safe parsers without compromising the speed or memory consumption. To
+that end, it uses extensively Rust's *strong typing* and *memory safety* to produce
+fast and correct parsers, and provides functions, macros and traits to abstract most of the
+error prone plumbing.
+
+
+
+*nom will happily take a byte out of your files :)*
+
+## Example
+
+[Hexadecimal color](https://developer.mozilla.org/en-US/docs/Web/CSS/color) parser:
+
+```rust
+extern crate nom;
+use nom::{
+ IResult,
+ bytes::complete::{tag, take_while_m_n},
+ combinator::map_res,
+ sequence::tuple
+};
+
+#[derive(Debug,PartialEq)]
+pub struct Color {
+ pub red: u8,
+ pub green: u8,
+ pub blue: u8,
+}
+
+fn from_hex(input: &str) -> Result<u8, std::num::ParseIntError> {
+ u8::from_str_radix(input, 16)
+}
+
+fn is_hex_digit(c: char) -> bool {
+ c.is_digit(16)
+}
+
+fn hex_primary(input: &str) -> IResult<&str, u8> {
+ map_res(
+ take_while_m_n(2, 2, is_hex_digit),
+ from_hex
+ )(input)
+}
+
+fn hex_color(input: &str) -> IResult<&str, Color> {
+ let (input, _) = tag("#")(input)?;
+ let (input, (red, green, blue)) = tuple((hex_primary, hex_primary, hex_primary))(input)?;
+
+ Ok((input, Color { red, green, blue }))
+}
+
+fn main() {}
+
+#[test]
+fn parse_color() {
+ assert_eq!(hex_color("#2F14DF"), Ok(("", Color {
+ red: 47,
+ green: 20,
+ blue: 223,
+ })));
+}
+```
+
+## Documentation
+
+- [Reference documentation](https://docs.rs/nom)
+- [Various design documents and tutorials](https://github.com/Geal/nom/tree/master/doc)
+- [list of combinators and their behaviour](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md)
+
+If you need any help developing your parsers, please ping `geal` on IRC (freenode, geeknode, oftc), go to `#nom-parsers` on Freenode IRC, or on the [Gitter chat room](https://gitter.im/Geal/nom).
+
+## Why use nom
+
+If you want to write:
+
+### binary format parsers
+
+nom was designed to properly parse binary formats from the beginning. Compared
+to the usual handwritten C parsers, nom parsers are just as fast, free from
+buffer overflow vulnerabilities, and handle common patterns for you:
+
+- [TLV](https://en.wikipedia.org/wiki/Type-length-value)
+- bit level parsing
+- hexadecimal viewer in the debugging macros for easy data analysis
+- streaming parsers for network formats and huge files
+
+Example projects:
+
+- [FLV parser](https://github.com/rust-av/flavors)
+- [Matroska parser](https://github.com/rust-av/matroska)
+- [tar parser](https://github.com/Keruspe/tar-parser.rs)
+
+### Text format parsers
+
+While nom was made for binary format at first, it soon grew to work just as
+well with text formats. From line based formats like CSV, to more complex, nested
+formats such as JSON, nom can manage it, and provides you with useful tools:
+
+- fast case insensitive comparison
+- recognizers for escaped strings
+- regular expressions can be embedded in nom parsers to represent complex character patterns succinctly
+- special care has been given to managing non ASCII characters properly
+
+Example projects:
+
+- [HTTP proxy](https://github.com/sozu-proxy/sozu/blob/master/lib/src/protocol/http/parser.rs)
+- [TOML parser](https://github.com/joelself/tomllib)
+
+### Programming language parsers
+
+While programming language parsers are usually written manually for more
+flexibility and performance, nom can be (and has been successfully) used
+as a prototyping parser for a language.
+
+nom will get you started quickly with powerful custom error types, that you
+can leverage with [nom_locate](https://github.com/fflorent/nom_locate) to
+pinpoint the exact line and column of the error. No need for separate
+tokenizing, lexing and parsing phases: nom can automatically handle whitespace
+parsing, and construct an AST in place.
+
+Example projects:
+
+- [PHP VM](https://github.com/tagua-vm/parser)
+- eve language prototype
+- [xshade shading language](https://github.com/xshade-lang/xshade/)
+
+### Streaming formats
+
+While a lot of formats (and the code handling them) assume that they can fit
+the complete data in memory, there are formats for which we only get a part
+of the data at once, like network formats, or huge files.
+nom has been designed for a correct behaviour with partial data: if there is
+not enough data to decide, nom will tell you it needs more instead of silently
+returning a wrong result. Whether your data comes entirely or in chunks, the
+result should be the same.
+
+It allows you to build powerful, deterministic state machines for your protocols.
+
+Example projects:
+
+- [HTTP proxy](https://github.com/sozu-proxy/sozu/blob/master/lib/src/protocol/http/parser.rs)
+- [using nom with generators](https://github.com/Geal/generator_nom)
+
+## Parser combinators
+
+Parser combinators are an approach to parsers that is very different from
+software like [lex](https://en.wikipedia.org/wiki/Lex_(software)) and
+[yacc](https://en.wikipedia.org/wiki/Yacc). Instead of writing the grammar
+in a separate file and generating the corresponding code, you use very
+small functions with very specific purpose, like "take 5 bytes", or
+"recognize the word 'HTTP'", and assemble then in meaningful patterns
+like "recognize 'HTTP', then a space, then a version".
+The resulting code is small, and looks like the grammar you would have
+written with other parser approaches.
+
+This has a few advantages:
+
+- the parsers are small and easy to write
+- the parsers components are easy to reuse (if they're general enough, please add them to nom!)
+- the parsers components are easy to test separately (unit tests and property-based tests)
+- the parser combination code looks close to the grammar you would have written
+- you can build partial parsers, specific to the data you need at the moment, and ignore the rest
+
+## Technical features
+
+nom parsers are for:
+- [x] **byte-oriented**: the basic type is `&[u8]` and parsers will work as much as possible on byte array slices (but are not limited to them)
+- [x] **bit-oriented**: nom can address a byte slice as a bit stream
+- [x] **string-oriented**: the same kind of combinators can apply on UTF-8 strings as well
+- [x] **zero-copy**: if a parser returns a subset of its input data, it will return a slice of that input, without copying
+- [x] **streaming**: nom can work on partial data and detect when it needs more data to produce a correct result
+- [x] **descriptive errors**: the parsers can aggregate a list of error codes with pointers to the incriminated input slice. Those error lists can be pattern matched to provide useful messages.
+- [x] **custom error types**: you can provide a specific type to improve errors returned by parsers
+- [x] **safe parsing**: nom leverages Rust's safe memory handling and powerful types, and parsers are routinely fuzzed and tested with real world data. So far, the only flaws found by fuzzing were in code written outside of nom
+- [x] **speed**: benchmarks have shown that nom parsers often outperform many parser combinators library like Parsec and attoparsec, some regular expression engines and even handwritten C parsers
+
+Some benchmarks are available on [Github](https://github.com/Geal/nom_benchmarks).
+
+## Rust version requirements
+
+The 5.0 series of nom requires **Rustc version 1.31 or greater**.
+
+Travis CI always has a build with a pinned version of Rustc matching the oldest supported Rust release.
+The current policy is that this will only be updated in the next major nom release.
+
+## Installation
+
+nom is available on [crates.io](https://crates.io/crates/nom) and can be included in your Cargo enabled project like this:
+
+```toml
+[dependencies]
+nom = "5"
+```
+
+Then include it in your code like this:
+
+```rust,ignore
+#[macro_use]
+extern crate nom;
+```
+
+**NOTE: if you have existing code using nom below the 5.0 version, please take a look
+at the [upgrade documentation](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_5.md)
+to handle the breaking changes.**
+
+There are a few compilation features:
+
+* `std`: (activated by default) if disabled, nom can work in `no_std` builds
+* `regexp`: enables regular expression parsers with the `regex` crate
+* `regexp_macros`: enables regular expression parsers with the `regex` and `regex_macros` crates. Regular expressions can be defined at compile time, but it requires a nightly version of rustc
+
+You can activate those features like this:
+
+```toml
+[dependencies.nom]
+version = "^5"
+features = ["regexp"]
+```
+
+# Related projects
+
+- [get line and column info in nom's input type](https://github.com/fflorent/nom_locate)
+- [using nom as lexer and parser](https://github.com/Rydgel/monkey-rust)
+
+# Parsers written with nom
+
+Here is a (non exhaustive) list of known projects using nom:
+
+- Text file formats:
+ * [Ceph Crush](https://github.com/cholcombe973/crushtool)
+ * [Cronenberg](https://github.com/ayrat555/cronenberg)
+ * [XFS Runtime Stats](https://github.com/ChrisMacNaughton/xfs-rs)
+ * [CSV](https://github.com/GuillaumeGomez/csv-parser)
+ * [FASTQ](https://github.com/elij/fastq.rs)
+ * [INI](https://github.com/Geal/nom/blob/master/tests/ini.rs)
+ * [ISO 8601 dates](https://github.com/badboy/iso8601)
+ * [libconfig-like configuration file format](https://github.com/filipegoncalves/rust-config)
+ * [Web archive](https://github.com/sbeckeriv/warc_nom_parser)
+ * [proto files](https://github.com/tafia/protobuf-parser)
+ * [Fountain screenplay markup](https://github.com/adamchalmers/fountain-rs)
+- Programming languages:
+ * [PHP](https://github.com/tagua-vm/parser)
+ * [Basic Calculator](https://github.com/balajisivaraman/basic_calculator_rs)
+ * [GLSL](https://github.com/phaazon/glsl)
+ * [Lua](https://github.com/doomrobo/nom-lua53)
+ * [Python](https://github.com/ProgVal/rust-python-parser)
+ * [SQL](https://github.com/ms705/nom-sql)
+ * [Elm](https://github.com/cout970/Elm-interpreter)
+ * [SystemVerilog](https://github.com/dalance/sv-parser)
+ * [Turtle](https://github.com/vandenoever/rome/tree/master/src/io/turtle)
+ * [CSML](https://github.com/CSML-by-Clevy/csml-interpreter)
+- Interface definition formats:
+ * [Thrift](https://github.com/thehydroimpulse/thrust)
+- Audio, video and image formats:
+ * [GIF](https://github.com/Geal/gif.rs)
+ * [MagicaVoxel .vox](https://github.com/davidedmonds/dot_vox)
+ * [midi](https://github.com/derekdreery/nom-midi-rs)
+ * [SWF](https://github.com/open-flash/swf-parser)
+ * [WAVE](http://github.com/noise-Labs/wave)
+- Document formats:
+ * [TAR](https://github.com/Keruspe/tar-parser.rs)
+ * [GZ](https://github.com/nharward/nom-gzip)
+- Cryptographic formats:
+ * [X.509](https://github.com/rusticata/x509-parser)
+- Network protocol formats:
+ * [Bencode](https://github.com/jbaum98/bencode.rs)
+ * [DHCP](https://github.com/rusticata/dhcp-parser)
+ * [HTTP](https://github.com/sozu-proxy/sozu/tree/master/lib/src/protocol/http)
+ * [URI](https://github.com/santifa/rrp/blob/master/src/uri.rs)
+ * [IMAP](https://github.com/djc/tokio-imap)
+ * [IRC](https://github.com/Detegr/RBot-parser)
+ * [Pcap-NG](https://github.com/richo/pcapng-rs)
+ * [Pcap](https://github.com/ithinuel/pcap-rs)
+ * [Pcap + PcapNG](https://github.com/rusticata/pcap-parser)
+ * [IKEv2](https://github.com/rusticata/ipsec-parser)
+ * [NTP](https://github.com/rusticata/ntp-parser)
+ * [SNMP](https://github.com/rusticata/snmp-parser)
+ * [Kerberos v5](https://github.com/rusticata/kerberos-parser)
+ * [DER](https://github.com/rusticata/der-parser)
+ * [TLS](https://github.com/rusticata/tls-parser)
+ * [IPFIX / Netflow v10](https://github.com/dominotree/rs-ipfix)
+ * [GTP](https://github.com/fuerstenau/gorrosion-gtp)
+- Language specifications:
+ * [BNF](https://github.com/snewt/bnf)
+- Misc formats:
+ * [Gameboy ROM](https://github.com/MarkMcCaskey/gameboy-rom-parser)
+
+Want to create a new parser using `nom`? A list of not yet implemented formats is available [here](https://github.com/Geal/nom/issues/14).
+
+Want to add your parser here? Create a pull request for it!
