forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(travis): set minimum rust version

Browse Source
This commit is contained in:
Sean McArthur
2017-04-10 10:28:10 -07:00
parent 030393d099
commit f05a58a1b2
12 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -6,6 +6,7 @@ matrix:
env: FEATURES="--features nightly"
- rust: beta
- rust: stable
- rust: 1.10.0
cache:
apt: true

4
Cargo.toml
View File

@@ -10,7 +10,6 @@ license = "MIT"
authors = ["Sean McArthur <sean.monstar@gmail.com>"]
keywords = ["http", "hyper", "hyperium"]
categories = ["web-programming::http-client", "web-programming::http-server"]
build = "build.rs"
include = [
"build.rs",
@@ -41,9 +40,6 @@ num_cpus = "1.0"
pretty_env_logger = "0.1"
spmc = "0.2"
[build-dependencies]
rustc_version = "0.1"
[features]
default = []
nightly = []

7
build.rs
View File

@@ -1,7 +0,0 @@
extern crate rustc_version as rustc;
fn main() {
if rustc::version_matches(">= 1.9") {
println!("cargo:rustc-cfg=has_deprecated");
}
}

6
src/header/common/accept_language.rs
View File

@@ -58,9 +58,9 @@ header! {
test_header!(
test2, vec![b"en-US, en; q=0.5, fr"],
Some(AcceptLanguage(vec![
qitem(langtag!(en;;;US)),
QualityItem::new(langtag!(en), Quality(500)),
qitem(langtag!(fr)),
qitem("en-US".parse().unwrap()),
QualityItem::new("en".parse().unwrap(), Quality(500)),
qitem("fr".parse().unwrap()),
])));
}
}

8
src/header/common/host.rs
View File

@@ -24,7 +24,9 @@ use header::parsing::from_one_raw_str;
///
/// let mut headers = Headers::new();
/// headers.set(
/// Host::new("hyper.rs", 8080)
/// // In Rust 1.12+
/// // Host::new("hyper.rs", 8080)
/// Host::new("hyper.rs", Some(8080))
/// );
/// ```
#[derive(Clone, PartialEq, Debug)]
@@ -113,13 +115,13 @@ mod tests {
let host = Header::parse_header(&vec![b"foo.com:8080".to_vec()].into());
assert_eq!(host.ok(), Some(Host::new("foo.com", 8080)));
assert_eq!(host.ok(), Some(Host::new("foo.com", Some(8080))));
let host = Header::parse_header(&vec![b"foo.com".to_vec()].into());
assert_eq!(host.ok(), Some(Host::new("foo.com", None)));
let host = Header::parse_header(&vec![b"[::1]:8080".to_vec()].into());
assert_eq!(host.ok(), Some(Host::new("[::1]", 8080)));
assert_eq!(host.ok(), Some(Host::new("[::1]", Some(8080))));
let host = Header::parse_header(&vec![b"[::1]".to_vec()].into());
assert_eq!(host.ok(), Some(Host::new("[::1]", None)));

4
src/header/common/link.rs
View File

@@ -982,7 +982,7 @@ mod tests {
.push_rel(RelationType::Previous)
.set_anchor("../anchor/example/")
.push_rev(RelationType::Next)
.push_href_lang(langtag!(de))
.push_href_lang("de".parse().unwrap())
.push_media_desc(MediaDesc::Screen)
.set_title("previous chapter")
.set_title_star("title* unparsed")
@@ -1042,7 +1042,7 @@ mod tests {
.push_rel(RelationType::Previous)
.set_anchor("/anchor/example/")
.push_rev(RelationType::Next)
.push_href_lang(langtag!(de))
.push_href_lang("de".parse().unwrap())
.push_media_desc(MediaDesc::Screen)
.set_title("previous chapter")
.set_title_star("title* unparsed")

3
src/header/parsing.rs
View File

@@ -177,10 +177,11 @@ mod percent_encoding_http {
mod tests {
use header::shared::Charset;
use super::{ExtendedValue, parse_extended_value};
use language_tags::LanguageTag;
#[test]
fn test_parse_extended_value_with_encoding_and_language_tag() {
let expected_language_tag = langtag!(en);
let expected_language_tag = "en".parse::<LanguageTag>().unwrap();
// RFC 5987, Section 3.2.2
// Extended notation, using the Unicode character U+00A3 (POUND SIGN)
let result = parse_extended_value("iso-8859-1'en'%A3%20rates");

2
src/http/h1/decode.rs
View File

@@ -458,7 +458,7 @@ mod tests {
let content_len = content.len();
for block_at in 0..content_len {
let actual = read_async(decoder.clone(), content.as_bytes(), block_at);
assert_eq!(expected, &actual, "Failed async. Blocking at {}", block_at);
assert_eq!(expected, &actual) //, "Failed async. Blocking at {}", block_at);
}
}

2
src/http/mod.rs
View File

@@ -131,7 +131,7 @@ pub trait Http1Transaction {
fn should_set_length(head: &MessageHead<Self::Outgoing>) -> bool;
}
type ParseResult<T> = ::Result<Option<(MessageHead<T>, usize)>>;
pub type ParseResult<T> = ::Result<Option<(MessageHead<T>, usize)>>;
struct DebugTruncate<'a>(&'a [u8]);

9
src/lib.rs
View File

@@ -18,7 +18,7 @@ extern crate bytes;
#[macro_use] extern crate futures;
extern crate futures_cpupool;
extern crate httparse;
#[cfg_attr(test, macro_use)] extern crate language_tags;
extern crate language_tags;
#[macro_use] extern crate log;
#[macro_use] pub extern crate mime;
extern crate base64;
@@ -56,13 +56,6 @@ macro_rules! unimplemented {
});
}
macro_rules! deprecated {
(#[$note:meta] $i:item) => (
#[cfg_attr(has_deprecated, $note)]
$i
);
}
#[cfg(test)]
mod mock;
pub mod client;

2
src/uri.rs
View File

@@ -553,6 +553,6 @@ fn test_uri_to_origin_form() {
for case in cases {
let uri = Uri::from_str(case.0).unwrap();
assert_eq!(origin_form(&uri), case.1, "{:?}", case);
assert_eq!(origin_form(&uri), case.1); //, "{:?}", case);
}
}

6
tests/client.rs
View File

@@ -78,7 +78,7 @@ macro_rules! test {
while n < buf.len() && n < expected.len() {
n += inc.read(&mut buf[n..]).unwrap();
}
assert_eq!(s(&buf[..n]), expected, "expected is invalid");
assert_eq!(s(&buf[..n]), expected);
inc.write_all($server_reply.as_ref()).unwrap();
let _ = tx.send(());
@@ -89,9 +89,9 @@ macro_rules! test {
let work = res.join(rx).map(|r| r.0);
let res = core.run(work).unwrap();
assert_eq!(res.status(), StatusCode::$client_status, "status is invalid");
assert_eq!(res.status(), StatusCode::$client_status);
$(
assert_eq!(res.headers().get(), Some(&$response_headers), "headers are invalid");
assert_eq!(res.headers().get(), Some(&$response_headers));
)*
}
);