fix edition idioms

chotchki · Aug 9, 2021 · 5a65658 · 5a65658
1 parent f5de114
commit 5a65658
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 46 deletions.
diff --git a/benches/arithmetic.rs b/benches/arithmetic.rs
@@ -1,7 +1,5 @@
-extern crate nom;
 #[macro_use]
 extern crate criterion;
-extern crate jemallocator;
 
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

diff --git a/benches/http.rs b/benches/http.rs
@@ -1,8 +1,5 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 
-extern crate criterion;
-extern crate jemallocator;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
@@ -70,7 +67,7 @@ fn is_version(c: u8) -> bool {
   c >= b'0' && c <= b'9' || c == b'.'
 }
 
-fn request_line(input: &[u8]) -> IResult<&[u8], Request> {
+fn request_line(input: &[u8]) -> IResult<&[u8], Request<'_>> {
   let (input, method) = take_while1(is_token)(input)?;
   let (input, _) = take_while1(is_space)(input)?;
   let (input, uri) = take_while1(is_not_space)(input)?;
@@ -96,15 +93,15 @@ fn message_header_value(input: &[u8]) -> IResult<&[u8], &[u8]> {
   Ok((input, data))
 }
 
-fn message_header(input: &[u8]) -> IResult<&[u8], Header> {
+fn message_header(input: &[u8]) -> IResult<&[u8], Header<'_>> {
   let (input, name) = take_while1(is_token)(input)?;
   let (input, _) = char(':')(input)?;
   let (input, value) = many1(message_header_value)(input)?;
 
   Ok((input, Header{ name, value }))
 }
 
-fn request(input: &[u8]) -> IResult<&[u8], (Request, Vec<Header>)> {
+fn request(input: &[u8]) -> IResult<&[u8], (Request<'_>, Vec<Header<'_>>)> {
   let (input, req) = request_line(input)?;
   let (input, h) = many1(message_header)(input)?;
   let (input, _) = line_ending(input)?;
@@ -113,7 +110,7 @@ fn request(input: &[u8]) -> IResult<&[u8], (Request, Vec<Header>)> {
 }
 
 
-fn parse(data: &[u8]) -> Option<Vec<(Request, Vec<Header>)>> {
+fn parse(data: &[u8]) -> Option<Vec<(Request<'_>, Vec<Header<'_>>)>> {
   let mut buf = &data[..];
   let mut v = Vec::new();
   loop {

diff --git a/benches/ini.rs b/benches/ini.rs
@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate jemallocator;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 

diff --git a/benches/ini_str.rs b/benches/ini_str.rs
@@ -1,6 +1,3 @@
-extern crate criterion;
-extern crate jemallocator;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 

diff --git a/benches/json.rs b/benches/json.rs
@@ -1,7 +1,5 @@
-extern crate nom;
 #[macro_use]
 extern crate criterion;
-extern crate jemallocator;
 
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

diff --git a/benches/number.rs b/benches/number.rs
@@ -1,7 +1,5 @@
-extern crate nom;
 #[macro_use]
 extern crate criterion;
-extern crate jemallocator;
 
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

diff --git a/examples/json.rs b/examples/json.rs
@@ -1,8 +1,5 @@
 #![cfg(feature = "alloc")]
 
-extern crate jemallocator;
-extern crate nom;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 

diff --git a/examples/s_expression.rs b/examples/s_expression.rs
@@ -4,9 +4,6 @@
 
 #![cfg(feature = "alloc")]
 
-extern crate jemallocator;
-extern crate nom;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 

diff --git a/examples/string.rs b/examples/string.rs
@@ -11,9 +11,6 @@
 
 #![cfg(feature = "alloc")]
 
-extern crate jemallocator;
-extern crate nom;
-
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 

diff --git a/src/internal.rs b/src/internal.rs
@@ -176,7 +176,7 @@ impl<E> fmt::Display for Err<E>
 where
   E: fmt::Debug,
 {
-  fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     match self {
       Err::Incomplete(Needed::Size(u)) => write!(f, "Parsing requires {} bytes/chars", u),
       Err::Incomplete(Needed::Unknown) => write!(f, "Parsing requires more data"),

diff --git a/src/lib.rs b/src/lib.rs
@@ -386,9 +386,7 @@
 extern crate alloc;
 #[cfg(doctest)]
 extern crate doc_comment;
-#[cfg(feature = "lexical")]
-extern crate lexical_core;
-extern crate memchr;
+
 #[cfg(nightly)]
 extern crate test;
 

diff --git a/tests/arithmetic.rs b/tests/arithmetic.rs
@@ -1,5 +1,3 @@
-extern crate nom;
-
 use nom::{
   branch::alt,
   bytes::complete::tag,

diff --git a/tests/arithmetic_ast.rs b/tests/arithmetic_ast.rs
@@ -1,5 +1,3 @@
-extern crate nom;
-
 use std::fmt;
 use std::fmt::{Debug, Display, Formatter};
 
@@ -33,7 +31,7 @@ pub enum Oper {
 }
 
 impl Display for Expr {
-  fn fmt(&self, format: &mut Formatter) -> fmt::Result {
+  fn fmt(&self, format: &mut Formatter<'_>) -> fmt::Result {
     use self::Expr::*;
     match *self {
       Value(val) => write!(format, "{}", val),
@@ -47,7 +45,7 @@ impl Display for Expr {
 }
 
 impl Debug for Expr {
-  fn fmt(&self, format: &mut Formatter) -> fmt::Result {
+  fn fmt(&self, format: &mut Formatter<'_>) -> fmt::Result {
     use self::Expr::*;
     match *self {
       Value(val) => write!(format, "{}", val),

diff --git a/tests/css.rs b/tests/css.rs
@@ -1,5 +1,3 @@
-extern crate nom;
-
 use nom::bytes::complete::{tag, take_while_m_n};
 use nom::combinator::map_res;
 use nom::sequence::tuple;

diff --git a/tests/fnmut.rs b/tests/fnmut.rs
@@ -1,5 +1,3 @@
-extern crate nom;
-
 use nom::{
   bytes::complete::tag,
   multi::{many0, many0_count},

diff --git a/tests/json.rs b/tests/json.rs
@@ -1,5 +1,4 @@
 #![cfg(feature = "alloc")]
-extern crate nom;
 
 use nom::{
   branch::alt,

diff --git a/tests/mp4.rs b/tests/mp4.rs
@@ -247,7 +247,7 @@ fn brand_name(input: &[u8]) -> IResult<&[u8], &str> {
   map_res(take(4_usize), str::from_utf8)(input)
 }
 
-fn filetype_parser(input: &[u8]) -> IResult<&[u8], FileType> {
+fn filetype_parser(input: &[u8]) -> IResult<&[u8], FileType<'_>> {
   let (i, name) = brand_name(input)?;
   let (i, version) = take(4_usize)(i)?;
   let (i, brands) = many0(brand_name)(i)?;

diff --git a/tests/multiline.rs b/tests/multiline.rs
@@ -1,5 +1,3 @@
-extern crate nom;
-
 use nom::{
   character::complete::{alphanumeric1 as alphanumeric, line_ending as eol},
   multi::many0,