1
0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-24 16:02:59 +01:00

remove unicase dependency

This commit is contained in:
axon-q 2018-06-07 10:33:00 +00:00
parent 82c888df22
commit c0c1817b5c
3 changed files with 5 additions and 9 deletions

View File

@ -77,7 +77,6 @@ time = "0.1"
encoding = "0.2" encoding = "0.2"
language-tags = "0.2" language-tags = "0.2"
lazy_static = "1.0" lazy_static = "1.0"
unicase = "2.1"
url = { version="1.7", features=["query_encoding"] } url = { version="1.7", features=["query_encoding"] }
cookie = { version="0.10", features=["percent-encode"] } cookie = { version="0.10", features=["percent-encode"] }
brotli2 = { version="^0.3.2", optional = true } brotli2 = { version="^0.3.2", optional = true }

View File

@ -7,8 +7,6 @@
// IANA assignment: http://www.iana.org/assignments/cont-disp/cont-disp.xhtml // IANA assignment: http://www.iana.org/assignments/cont-disp/cont-disp.xhtml
use language_tags::LanguageTag; use language_tags::LanguageTag;
use unicase;
use header; use header;
use header::{Header, IntoHeaderValue, Writer}; use header::{Header, IntoHeaderValue, Writer};
use header::shared::Charset; use header::shared::Charset;
@ -100,9 +98,9 @@ impl ContentDisposition {
}; };
let mut cd = ContentDisposition { let mut cd = ContentDisposition {
disposition: if unicase::eq_ascii(&*disposition, "inline") { disposition: if disposition.eq_ignore_ascii_case("inline") {
DispositionType::Inline DispositionType::Inline
} else if unicase::eq_ascii(&*disposition, "attachment") { } else if disposition.eq_ignore_ascii_case("attachment") {
DispositionType::Attachment DispositionType::Attachment
} else { } else {
DispositionType::Ext(disposition.to_owned()) DispositionType::Ext(disposition.to_owned())
@ -126,11 +124,11 @@ impl ContentDisposition {
}; };
cd.parameters.push( cd.parameters.push(
if unicase::eq_ascii(&*key, "filename") { if key.eq_ignore_ascii_case("filename") {
DispositionParam::Filename( DispositionParam::Filename(
Charset::Ext("UTF-8".to_owned()), None, Charset::Ext("UTF-8".to_owned()), None,
val.trim_matches('"').as_bytes().to_owned()) val.trim_matches('"').as_bytes().to_owned())
} else if unicase::eq_ascii(&*key, "filename*") { } else if key.eq_ignore_ascii_case("filename*") {
let extended_value = try!(header::parse_extended_value(val)); let extended_value = try!(header::parse_extended_value(val));
DispositionParam::Filename(extended_value.charset, extended_value.language_tag, extended_value.value) DispositionParam::Filename(extended_value.charset, extended_value.language_tag, extended_value.value)
} else { } else {
@ -177,7 +175,7 @@ impl fmt::Display for ContentDisposition {
let mut use_simple_format: bool = false; let mut use_simple_format: bool = false;
if opt_lang.is_none() { if opt_lang.is_none() {
if let Charset::Ext(ref ext) = *charset { if let Charset::Ext(ref ext) = *charset {
if unicase::eq_ascii(&**ext, "utf-8") { if ext.eq_ignore_ascii_case("utf-8") {
use_simple_format = true; use_simple_format = true;
} }
} }

View File

@ -118,7 +118,6 @@ extern crate tokio_io;
extern crate tokio_reactor; extern crate tokio_reactor;
extern crate tokio_tcp; extern crate tokio_tcp;
extern crate tokio_timer; extern crate tokio_timer;
extern crate unicase;
extern crate url; extern crate url;
#[macro_use] #[macro_use]
extern crate serde; extern crate serde;