From 0fb256bbdfe3bd8fc2c53adb17f7eb5717c25311 Mon Sep 17 00:00:00 2001 From: Richard Whitehouse Date: Sun, 12 Nov 2017 18:11:15 +0000 Subject: [PATCH] Fix compile warnings --- src/codec.rs | 14 +++++++------- src/lib.rs | 2 +- src/parser.rs | 5 ++--- src/types.rs | 9 +++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/codec.rs b/src/codec.rs index 5d7bb5a..c982789 100644 --- a/src/codec.rs +++ b/src/codec.rs @@ -52,7 +52,7 @@ impl UnparsedLine { } } -struct SipCodec { +pub struct SipCodec { message: Option, headers: Vec, top_line: Option, @@ -60,7 +60,7 @@ struct SipCodec { } impl SipCodec { - fn new() -> SipCodec { + pub fn new() -> SipCodec { SipCodec { message: None, headers: Vec::new(), @@ -229,13 +229,13 @@ impl PartialMessage { } #[derive(Debug)] -enum Message { +pub enum Message { Request(Request), Response(Response), } #[derive(Debug)] -struct Response { +pub struct Response { status_line: (StatusLine, UnparsedLine), headers: Vec<(Header, UnparsedLine)>, body: Option, @@ -248,7 +248,7 @@ impl Response { } #[derive(Debug)] -struct Request { +pub struct Request { request_line: (RequestLine, UnparsedLine), headers: Vec<(Header, UnparsedLine)>, body: Option, @@ -335,7 +335,7 @@ impl Encoder for SipCodec { } } -struct Sip { +pub struct Sip { listeners: Vec, } @@ -354,7 +354,7 @@ fn chartype(char: Option<&u8>) -> CharType { } impl Sip { - fn new() -> Sip { + pub fn new() -> Sip { Sip { listeners: Vec::new() } } diff --git a/src/lib.rs b/src/lib.rs index 5418383..dedf171 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,4 +10,4 @@ extern crate nom; mod types; mod parser; -mod codec; +pub mod codec; diff --git a/src/parser.rs b/src/parser.rs index d888f22..1052e82 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -144,7 +144,6 @@ fn escaped(input: &[u8]) -> IResult<&[u8], u8> { } } -named!(unreserved<&[u8], u8>, take_1!(is_unreserved)); named!(user_unreserved<&[u8], u8>, take_1!(is_user_unreserved)); named!(password_unreserved<&[u8], u8>, take_1!(is_password_unreserved)); @@ -716,8 +715,8 @@ named!(dresponse>, preceded!( response_digest)); named!(algorithm, alt!( - tag!("MD5") => { |_| Algorithm::MD5 } | - tag!("MD5-sess") => { |_| Algorithm::MD5_sess } | + tag!("MD5") => { |_| Algorithm::Md5 } | + tag!("MD5-sess") => { |_| Algorithm::Md5Session } | token => { |t| Algorithm::Token(t) } )); diff --git a/src/types.rs b/src/types.rs index 73cf82c..aca4e2d 100644 --- a/src/types.rs +++ b/src/types.rs @@ -107,8 +107,9 @@ pub type AbsoluteUri = (Scheme, UriPath); pub enum Uri { Sip(SipUri), Sips(SipUri), - Tel(Vec), - Urn(Vec), +// Not currently implemented +// Tel(Vec), +// Urn(Vec), Generic { scheme: Scheme, path: UriPath }, } @@ -209,8 +210,8 @@ pub type AuthParam = (Vec, Vec); #[derive(Debug)] pub enum Algorithm { - MD5, - MD5_sess, + Md5, + Md5Session, Token(Vec), } -- 2.34.1