Skip to content

Commit

Permalink
fix(hyper-up): work with hyper v0.6.0
Browse files Browse the repository at this point in the history
Currently the latter actually fails to link on OSX, and requires a local
override with [this fix](https://goo.gl/OTExmN).
  • Loading branch information
Byron committed Jun 26, 2015
1 parent 27fdd8e commit d0491a4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/mako/Cargo.toml.mako
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ name = "${util.program_name()}"
% endif
[dependencies]
hyper = ">= 0.5.2"
hyper = ">= 0.6.0"
## Must match the one hyper uses, otherwise there are duplicate similarly named `Mime` structs
mime = "0.0.11"
mime = "0.0.12"
serde = ">= 0.4.1"
yup-oauth2 = "*"
% for dep in cargo.get('dependencies', list()):
Expand Down
2 changes: 1 addition & 1 deletion src/mako/cli/lib/engine.mako
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ impl<'n, 'a> Engine<'n, 'a> {
<%def name="_debug_client(flag_name)" buffered="True">\
if opt.is_present("${flag_name}") {
hyper::Client::with_connector(mock::TeeConnector {
connector: hyper::net::HttpConnector(None)
connector: hyper::net::HttpsConnector::<hyper::net::Openssl>::default()
})
} else {
hyper::Client::new()
Expand Down
14 changes: 7 additions & 7 deletions src/rust/api/cmn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use oauth2::{TokenType, Retry, self};
use hyper;
use hyper::header::{ContentType, ContentLength, Headers, UserAgent, Authorization, Header,
HeaderFormat};
use hyper::http::LINE_ENDING;
use hyper::http::h1::LINE_ENDING;
use hyper::method::Method;
use hyper::status::StatusCode;

Expand Down Expand Up @@ -502,7 +502,7 @@ impl ::std::ops::DerefMut for XUploadContentType {
}
impl Header for XUploadContentType {
fn header_name() -> &'static str { "X-Upload-Content-Type" }
fn parse_header(raw: &[Vec<u8>]) -> Option<Self> {
fn parse_header(raw: &[Vec<u8>]) -> hyper::error::Result<Self> {
hyper::header::parsing::from_one_raw_str(raw).map(XUploadContentType)
}
}
Expand Down Expand Up @@ -567,8 +567,8 @@ impl Header for ContentRange {
}

/// We are not parsable, as parsing is done by the `Range` header
fn parse_header(_: &[Vec<u8>]) -> Option<Self> {
None
fn parse_header(_: &[Vec<u8>]) -> hyper::error::Result<Self> {
Err(hyper::error::Error::Method)
}
}

Expand All @@ -593,19 +593,19 @@ impl Header for RangeResponseHeader {
"Range"
}

fn parse_header(raw: &[Vec<u8>]) -> Option<Self> {
fn parse_header(raw: &[Vec<u8>]) -> hyper::error::Result<Self> {
if raw.len() > 0 {
let v = &raw[0];
if let Ok(s) = std::str::from_utf8(v) {
const PREFIX: &'static str = "bytes ";
if s.starts_with(PREFIX) {
if let Ok(c) = <Chunk as FromStr>::from_str(&s[PREFIX.len()..]) {
return Some(RangeResponseHeader(c))
return Ok(RangeResponseHeader(c))
}
}
}
}
None
Err(hyper::error::Error::Method)
}
}

Expand Down

0 comments on commit d0491a4

Please sign in to comment.