Auto merge of #6254 - servo:rustup_20150601, r=SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6254)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-02 12:53:37 -05:00
commit 20f63459ef
15 changed files with 178 additions and 237 deletions

View file

@ -30,6 +30,6 @@ rustc-serialize = "0.3"
cookie="*"
regex = "0.1.14"
regex_macros = "0.1.8"
hyper = "0.4"
hyper = "0.5"
flate2 = "0.2.0"
uuid = "0.1.16"

View file

@ -131,7 +131,7 @@ reason: \"certificate verify failed\" }]))";
let mut connector = if opts::get().nossl {
HttpConnector(None)
} else {
HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext) + Send>))
HttpConnector(Some(box verifier as Box<Fn(&mut SslContext) + Send>))
};
let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {