Switch to edition 2018

Cargo.toml

@@ -7,6 +7,7 @@ license = "LGPL-2.1+"
 homepage = "https://github.com/rusticata/ssh-parser"
 repository = "https://github.com/rusticata/ssh-parser"
 documentation = "https://docs.rs/ssh-parser"
+edition = "2018"
 
 [features]
 integers = ["num-bigint", "num-traits"]

src/lib.rs

@@ -3,29 +3,12 @@
 //!  The code is available on [GitHub](https://github.com/rusticata/ssh-parser)
 //!  and is part of the [Rusticata](https://github.com/rusticata) project.
 
-#[macro_use]
-extern crate rusticata_macros;
-
-#[macro_use]
-extern crate nom;
-
-#[cfg(feature = "serialize")]
-#[macro_use]
-extern crate cookie_factory;
-
-#[cfg(feature = "integers")]
-extern crate num_bigint;
-#[cfg(feature = "integers")]
-extern crate num_traits;
-
 #[cfg(feature = "integers")]
 pub mod mpint;
 #[cfg(feature = "serialize")]
 /// SSH packet crafting functions
 pub mod serialize;
-/// SSH parsing functions
-pub mod ssh;
-
+mod ssh;
 #[cfg(test)]
 mod tests;
 

src/ssh.rs

@@ -2,13 +2,15 @@
 //!
 //! This module contains parsing functions for the SSH 2.0 protocol. It is also
 //! compatible with obsolete version negotiation.
-use std::str;
 
 use nom;
 use nom::character::streaming::{crlf, line_ending, not_line_ending};
 use nom::error::{Error, ErrorKind};
 use nom::number::streaming::{be_u32, be_u8};
+use nom::*;
 use nom::{take_until, Err, IResult};
+use rusticata_macros::error_if;
+use std::str;
 
 /// SSH Protocol Version Exchange
 ///