From b521e9b2218a23b3c2e288611ec123042b287053 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 3 May 2020 14:33:29 +0100
Subject: [PATCH] conditional test compilation [range, charset] (#1483)
* conditionally compile range and charset tests
* remove deprecated try macros
Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
---
actix-http/src/extensions.rs | 2 +
actix-http/src/header/common/range.rs | 302 +++++++++++-------------
actix-http/src/header/shared/charset.rs | 29 ++-
src/config.rs | 1 +
4 files changed, 159 insertions(+), 175 deletions(-)
diff --git a/actix-http/src/extensions.rs b/actix-http/src/extensions.rs
index 6a4a034a..4e391853 100644
--- a/actix-http/src/extensions.rs
+++ b/actix-http/src/extensions.rs
@@ -6,6 +6,8 @@ use fxhash::FxHashMap;
#[derive(Default)]
/// A type map of request extensions.
pub struct Extensions {
+ /// Use FxHasher with a std HashMap with for faster
+ /// lookups on the small `TypeId` (u64 equivalent) keys.
map: FxHashMap<TypeId, Box<dyn Any>>,
}
diff --git a/actix-http/src/header/common/range.rs b/actix-http/src/header/common/range.rs
index fc1bc815..f9e203bb 100644
--- a/actix-http/src/header/common/range.rs
+++ b/actix-http/src/header/common/range.rs
@@ -183,13 +183,13 @@ impl fmt::Display for Range {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Range::Bytes(ref ranges) => {
- try!(write!(f, "bytes="));
+ write!(f, "bytes=")?;
for (i, range) in ranges.iter().enumerate() {
if i != 0 {
- try!(f.write_str(","));
+ f.write_str(",")?;
}
- try!(Display::fmt(range, f));
+ Display::fmt(range, f)?;
}
Ok(())
}
@@ -214,9 +214,9 @@ impl FromStr for Range {
}
Ok(Range::Bytes(ranges))
}
- (Some(unit), Some(range_str)) if unit != "" && range_str != "" => Ok(
- Range::Unregistered(unit.to_owned(), range_str.to_owned()),
- ),
+ (Some(unit), Some(range_str)) if unit != "" && range_str != "" => {
+ Ok(Range::Unregistered(unit.to_owned(), range_str.to_owned()))
+ }
_ => Err(::Error::Header),
}
}
@@ -229,7 +229,8 @@ impl FromStr for ByteRangeSpec {
let mut parts = s.splitn(2, '-');
match (parts.next(), parts.next()) {
- (Some(""), Some(end)) => end.parse()
+ (Some(""), Some(end)) => end
+ .parse()
.or(Err(::Error::Header))
.map(ByteRangeSpec::Last),
(Some(start), Some("")) => start
@@ -272,163 +273,138 @@ impl Header for Range {
}
}
-#[test]
-fn test_parse_bytes_range_valid() {
- let r: Range = Header::parse_header(&"bytes=1-100".into()).unwrap();
- let r2: Range = Header::parse_header(&"bytes=1-100,-".into()).unwrap();
- let r3 = Range::bytes(1, 100);
- assert_eq!(r, r2);
- assert_eq!(r2, r3);
+#[cfg(test)]
+mod tests {
+ use super::*;
- let r: Range = Header::parse_header(&"bytes=1-100,200-".into()).unwrap();
- let r2: Range =
- Header::parse_header(&"bytes= 1-100 , 101-xxx, 200- ".into()).unwrap();
- let r3 = Range::Bytes(vec![
- ByteRangeSpec::FromTo(1, 100),
- ByteRangeSpec::AllFrom(200),
- ]);
- assert_eq!(r, r2);
- assert_eq!(r2, r3);
+ #[test]
+ fn test_parse_bytes_range_valid() {
+ let r: Range = Header::parse_header(&"bytes=1-100".into()).unwrap();
+ let r2: Range = Header::parse_header(&"bytes=1-100,-".into()).unwrap();
+ let r3 = Range::bytes(1, 100);
+ assert_eq!(r, r2);
+ assert_eq!(r2, r3);
- let r: Range = Header::parse_header(&"bytes=1-100,-100".into()).unwrap();
- let r2: Range = Header::parse_header(&"bytes=1-100, ,,-100".into()).unwrap();
- let r3 = Range::Bytes(vec![
- ByteRangeSpec::FromTo(1, 100),
- ByteRangeSpec::Last(100),
- ]);
- assert_eq!(r, r2);
- assert_eq!(r2, r3);
+ let r: Range = Header::parse_header(&"bytes=1-100,200-".into()).unwrap();
+ let r2: Range =
+ Header::parse_header(&"bytes= 1-100 , 101-xxx, 200- ".into()).unwrap();
+ let r3 = Range::Bytes(vec![
+ ByteRangeSpec::FromTo(1, 100),
+ ByteRangeSpec::AllFrom(200),
+ ]);
+ assert_eq!(r, r2);
+ assert_eq!(r2, r3);
- let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
- let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
- assert_eq!(r, r2);
-}
-
-#[test]
-fn test_parse_unregistered_range_valid() {
- let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
- let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
- assert_eq!(r, r2);
-
- let r: Range = Header::parse_header(&"custom=abcd".into()).unwrap();
- let r2 = Range::Unregistered("custom".to_owned(), "abcd".to_owned());
- assert_eq!(r, r2);
-
- let r: Range = Header::parse_header(&"custom=xxx-yyy".into()).unwrap();
- let r2 = Range::Unregistered("custom".to_owned(), "xxx-yyy".to_owned());
- assert_eq!(r, r2);
-}
-
-#[test]
-fn test_parse_invalid() {
- let r: ::Result<Range> = Header::parse_header(&"bytes=1-a,-".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"bytes=1-2-3".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"abc".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"bytes=1-100=".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"bytes=".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"custom=".into());
- assert_eq!(r.ok(), None);
-
- let r: ::Result<Range> = Header::parse_header(&"=1-100".into());
- assert_eq!(r.ok(), None);
-}
-
-#[test]
-fn test_fmt() {
- use header::Headers;
-
- let mut headers = Headers::new();
-
- headers.set(Range::Bytes(vec![
- ByteRangeSpec::FromTo(0, 1000),
- ByteRangeSpec::AllFrom(2000),
- ]));
- assert_eq!(&headers.to_string(), "Range: bytes=0-1000,2000-\r\n");
-
- headers.clear();
- headers.set(Range::Bytes(vec![]));
-
- assert_eq!(&headers.to_string(), "Range: bytes=\r\n");
-
- headers.clear();
- headers.set(Range::Unregistered(
- "custom".to_owned(),
- "1-xxx".to_owned(),
- ));
-
- assert_eq!(&headers.to_string(), "Range: custom=1-xxx\r\n");
-}
-
-#[test]
-fn test_byte_range_spec_to_satisfiable_range() {
- assert_eq!(
- Some((0, 0)),
- ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(3)
- );
- assert_eq!(
- Some((1, 2)),
- ByteRangeSpec::FromTo(1, 2).to_satisfiable_range(3)
- );
- assert_eq!(
- Some((1, 2)),
- ByteRangeSpec::FromTo(1, 5).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::FromTo(3, 3).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::FromTo(2, 1).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(0)
- );
-
- assert_eq!(
- Some((0, 2)),
- ByteRangeSpec::AllFrom(0).to_satisfiable_range(3)
- );
- assert_eq!(
- Some((2, 2)),
- ByteRangeSpec::AllFrom(2).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::AllFrom(3).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::AllFrom(5).to_satisfiable_range(3)
- );
- assert_eq!(
- None,
- ByteRangeSpec::AllFrom(0).to_satisfiable_range(0)
- );
-
- assert_eq!(
- Some((1, 2)),
- ByteRangeSpec::Last(2).to_satisfiable_range(3)
- );
- assert_eq!(
- Some((2, 2)),
- ByteRangeSpec::Last(1).to_satisfiable_range(3)
- );
- assert_eq!(
- Some((0, 2)),
- ByteRangeSpec::Last(5).to_satisfiable_range(3)
- );
- assert_eq!(None, ByteRangeSpec::Last(0).to_satisfiable_range(3));
- assert_eq!(None, ByteRangeSpec::Last(2).to_satisfiable_range(0));
+ let r: Range = Header::parse_header(&"bytes=1-100,-100".into()).unwrap();
+ let r2: Range = Header::parse_header(&"bytes=1-100, ,,-100".into()).unwrap();
+ let r3 = Range::Bytes(vec![
+ ByteRangeSpec::FromTo(1, 100),
+ ByteRangeSpec::Last(100),
+ ]);
+ assert_eq!(r, r2);
+ assert_eq!(r2, r3);
+
+ let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
+ let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
+ assert_eq!(r, r2);
+ }
+
+ #[test]
+ fn test_parse_unregistered_range_valid() {
+ let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
+ let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
+ assert_eq!(r, r2);
+
+ let r: Range = Header::parse_header(&"custom=abcd".into()).unwrap();
+ let r2 = Range::Unregistered("custom".to_owned(), "abcd".to_owned());
+ assert_eq!(r, r2);
+
+ let r: Range = Header::parse_header(&"custom=xxx-yyy".into()).unwrap();
+ let r2 = Range::Unregistered("custom".to_owned(), "xxx-yyy".to_owned());
+ assert_eq!(r, r2);
+ }
+
+ #[test]
+ fn test_parse_invalid() {
+ let r: ::Result<Range> = Header::parse_header(&"bytes=1-a,-".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"bytes=1-2-3".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"abc".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"bytes=1-100=".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"bytes=".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"custom=".into());
+ assert_eq!(r.ok(), None);
+
+ let r: ::Result<Range> = Header::parse_header(&"=1-100".into());
+ assert_eq!(r.ok(), None);
+ }
+
+ #[test]
+ fn test_fmt() {
+ use header::Headers;
+
+ let mut headers = Headers::new();
+
+ headers.set(Range::Bytes(vec![
+ ByteRangeSpec::FromTo(0, 1000),
+ ByteRangeSpec::AllFrom(2000),
+ ]));
+ assert_eq!(&headers.to_string(), "Range: bytes=0-1000,2000-\r\n");
+
+ headers.clear();
+ headers.set(Range::Bytes(vec![]));
+
+ assert_eq!(&headers.to_string(), "Range: bytes=\r\n");
+
+ headers.clear();
+ headers.set(Range::Unregistered("custom".to_owned(), "1-xxx".to_owned()));
+
+ assert_eq!(&headers.to_string(), "Range: custom=1-xxx\r\n");
+ }
+
+ #[test]
+ fn test_byte_range_spec_to_satisfiable_range() {
+ assert_eq!(
+ Some((0, 0)),
+ ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(3)
+ );
+ assert_eq!(
+ Some((1, 2)),
+ ByteRangeSpec::FromTo(1, 2).to_satisfiable_range(3)
+ );
+ assert_eq!(
+ Some((1, 2)),
+ ByteRangeSpec::FromTo(1, 5).to_satisfiable_range(3)
+ );
+ assert_eq!(None, ByteRangeSpec::FromTo(3, 3).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::FromTo(2, 1).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(0));
+
+ assert_eq!(
+ Some((0, 2)),
+ ByteRangeSpec::AllFrom(0).to_satisfiable_range(3)
+ );
+ assert_eq!(
+ Some((2, 2)),
+ ByteRangeSpec::AllFrom(2).to_satisfiable_range(3)
+ );
+ assert_eq!(None, ByteRangeSpec::AllFrom(3).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::AllFrom(5).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::AllFrom(0).to_satisfiable_range(0));
+
+ assert_eq!(Some((1, 2)), ByteRangeSpec::Last(2).to_satisfiable_range(3));
+ assert_eq!(Some((2, 2)), ByteRangeSpec::Last(1).to_satisfiable_range(3));
+ assert_eq!(Some((0, 2)), ByteRangeSpec::Last(5).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::Last(0).to_satisfiable_range(3));
+ assert_eq!(None, ByteRangeSpec::Last(2).to_satisfiable_range(0));
+ }
}
diff --git a/actix-http/src/header/shared/charset.rs b/actix-http/src/header/shared/charset.rs
index 6ddfa03e..00e7309d 100644
--- a/actix-http/src/header/shared/charset.rs
+++ b/actix-http/src/header/shared/charset.rs
@@ -137,17 +137,22 @@ impl FromStr for Charset {
}
}
-#[test]
-fn test_parse() {
- assert_eq!(Us_Ascii, "us-ascii".parse().unwrap());
- assert_eq!(Us_Ascii, "US-Ascii".parse().unwrap());
- assert_eq!(Us_Ascii, "US-ASCII".parse().unwrap());
- assert_eq!(Shift_Jis, "Shift-JIS".parse().unwrap());
- assert_eq!(Ext("ABCD".to_owned()), "abcd".parse().unwrap());
-}
+#[cfg(test)]
+mod tests {
+ use super::*;
-#[test]
-fn test_display() {
- assert_eq!("US-ASCII", format!("{}", Us_Ascii));
- assert_eq!("ABCD", format!("{}", Ext("ABCD".to_owned())));
+ #[test]
+ fn test_parse() {
+ assert_eq!(Us_Ascii, "us-ascii".parse().unwrap());
+ assert_eq!(Us_Ascii, "US-Ascii".parse().unwrap());
+ assert_eq!(Us_Ascii, "US-ASCII".parse().unwrap());
+ assert_eq!(Shift_Jis, "Shift-JIS".parse().unwrap());
+ assert_eq!(Ext("ABCD".to_owned()), "abcd".parse().unwrap());
+ }
+
+ #[test]
+ fn test_display() {
+ assert_eq!("US-ASCII", format!("{}", Us_Ascii));
+ assert_eq!("ABCD", format!("{}", Ext("ABCD".to_owned())));
+ }
}
diff --git a/src/config.rs b/src/config.rs
index 6db378c7..19a5ccc7 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -123,6 +123,7 @@ impl AppService {
}
}
+/// Application connection config
#[derive(Clone)]
pub struct AppConfig(Rc<AppConfigInner>);