From 9835e2ae736235810b4ea1c162ca5e65c547e770 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 04:49:50 +0200 Subject: Merging upstream version 1.71.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/nom/src/lib.rs | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'vendor/nom/src/lib.rs') diff --git a/vendor/nom/src/lib.rs b/vendor/nom/src/lib.rs index 1ce115aad..3beb2f417 100644 --- a/vendor/nom/src/lib.rs +++ b/vendor/nom/src/lib.rs @@ -52,16 +52,16 @@ //! //! The code is available on [Github](https://github.com/Geal/nom) //! -//! There are a few [guides](https://github.com/Geal/nom/tree/master/doc) with more details -//! about [how to write parsers](https://github.com/Geal/nom/blob/master/doc/making_a_new_parser_from_scratch.md), -//! or the [error management system](https://github.com/Geal/nom/blob/master/doc/error_management.md). +//! There are a few [guides](https://github.com/Geal/nom/tree/main/doc) with more details +//! about [how to write parsers](https://github.com/Geal/nom/blob/main/doc/making_a_new_parser_from_scratch.md), +//! or the [error management system](https://github.com/Geal/nom/blob/main/doc/error_management.md). //! You can also check out the [recipes] module that contains examples of common patterns. //! //! **Looking for a specific combinator? Read the -//! ["choose a combinator" guide](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md)** +//! ["choose a combinator" guide](https://github.com/Geal/nom/blob/main/doc/choosing_a_combinator.md)** //! //! If you are upgrading to nom 5.0, please read the -//! [migration document](https://github.com/Geal/nom/blob/master/doc/upgrading_to_nom_5.md). +//! [migration document](https://github.com/Geal/nom/blob/main/doc/upgrading_to_nom_5.md). //! //! ## Parser combinators //! @@ -167,8 +167,8 @@ //! - An error `Err(Err::Incomplete(Needed))` indicating that more input is necessary. `Needed` can indicate how much data is needed //! - An error `Err(Err::Failure(c))`. It works like the `Error` case, except it indicates an unrecoverable error: We cannot backtrack and test another parser //! -//! Please refer to the ["choose a combinator" guide](https://github.com/Geal/nom/blob/master/doc/choosing_a_combinator.md) for an exhaustive list of parsers. -//! See also the rest of the documentation [here](https://github.com/Geal/nom/blob/master/doc). +//! Please refer to the ["choose a combinator" guide](https://github.com/Geal/nom/blob/main/doc/choosing_a_combinator.md) for an exhaustive list of parsers. +//! See also the rest of the documentation [here](https://github.com/Geal/nom/blob/main/doc). //! //! ## Making new parsers with function combinators //! @@ -253,7 +253,7 @@ //! - **`many0`**: Will apply the parser 0 or more times (if it returns the `O` type, the new parser returns `Vec`) //! - **`many1`**: Will apply the parser 1 or more times //! -//! There are more complex (and more useful) parsers like `tuple!`, which is +//! There are more complex (and more useful) parsers like `tuple`, which is //! used to apply a series of parsers then assemble their results. //! //! Example with `tuple`: @@ -369,11 +369,10 @@ //! // while the complete version knows that all of the data is there //! assert_eq!(alpha0_complete("abcd"), Ok(("", "abcd"))); //! ``` -//! **Going further:** Read the [guides](https://github.com/Geal/nom/tree/master/doc), +//! **Going further:** Read the [guides](https://github.com/Geal/nom/tree/main/doc), //! check out the [recipes]! #![cfg_attr(not(feature = "std"), no_std)] #![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(extended_key_value_attributes))] #![deny(missing_docs)] @@ -384,9 +383,6 @@ extern crate alloc; #[cfg(doctest)] extern crate doc_comment; -#[cfg(nightly)] -extern crate test; - #[cfg(doctest)] doc_comment::doctest!("../README.md"); @@ -442,16 +438,17 @@ pub use self::traits::*; pub use self::str::*; +#[macro_use] +mod macros; #[macro_use] pub mod error; +pub mod branch; pub mod combinator; mod internal; -mod traits; -#[macro_use] -pub mod branch; pub mod multi; pub mod sequence; +mod traits; pub mod bits; pub mod bytes; -- cgit v1.2.3