Auto merge of #10173 - servo:rustup, r=nox

Bump Rust to 2016-04-06

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10173)
<!-- Reviewable:end -->

8 files changed, 16 insertions, 16 deletions

diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml
index 298be495f19..cb4818d1e7f 100644
--- a/components/plugins/Cargo.toml
+++ b/components/plugins/Cargo.toml
@@ -15,7 +15,7 @@ rev = "9dca15de3e8ea266d3e7e868c0f358ed4fa5f195"
 optional = true
 
 [dependencies]
-tenacious = "0.1.0"
+tenacious = "0.1.2"
 url = {version = "0.5.7", features = ["heap_size"]}
 
 [features]
diff --git a/components/plugins/lints/str_to_string.rs b/components/plugins/lints/str_to_string.rs
index 6070d9fcd85..8a1f1530898 100644
--- a/components/plugins/lints/str_to_string.rs
+++ b/components/plugins/lints/str_to_string.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
-use rustc::middle::ty;
+use rustc::ty;
 use rustc_front::hir;
 
 declare_lint!(STR_TO_STRING, Deny,
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index 0bd57774d62..56db0f5f9c4 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/components/plugins/lints/unrooted_must_root.rs
@@ -5,7 +5,7 @@
 use rustc::front::map as ast_map;
 use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
 use rustc::middle::pat_util::pat_is_binding;
-use rustc::middle::ty;
+use rustc::ty;
 use rustc_front::hir;
 use rustc_front::intravisit as visit;
 use syntax::attr::AttrMetaMethods;
@@ -125,11 +125,11 @@ impl LateLintPass for UnrootedPass {
     fn check_fn(&mut self, cx: &LateContext, kind: visit::FnKind, decl: &hir::FnDecl,
                 block: &hir::Block, span: codemap::Span, _id: ast::NodeId) {
         let in_new_function = match kind {
-            visit::FnKind::ItemFn(n, _, _, _, _, _) |
-            visit::FnKind::Method(n, _, _) => {
+            visit::FnKind::ItemFn(n, _, _, _, _, _, _) |
+            visit::FnKind::Method(n, _, _, _) => {
                 n.as_str() == "new" || n.as_str().starts_with("new_")
             }
-            visit::FnKind::Closure => return,
+            visit::FnKind::Closure(_) => return,
         };
 
         for arg in &decl.inputs {
@@ -223,7 +223,7 @@ impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx>
 
     fn visit_fn(&mut self, kind: visit::FnKind<'a>, decl: &'a hir::FnDecl,
                 block: &'a hir::Block, span: codemap::Span, _id: ast::NodeId) {
-        if kind == visit::FnKind::Closure {
+        if let visit::FnKind::Closure(_) = kind {
             visit::walk_fn(self, kind, decl, block, span);
         }
     }
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 28b602cb3f3..927d1aab7bf 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1536,7 +1536,7 @@ dependencies = [
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2067,7 +2067,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 56d1515dc6d..3e653037a9e 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1405,7 +1405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1946,7 +1946,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock
index e9beb6c167e..ca7d81e2d47 100644
--- a/ports/geckolib/Cargo.lock
+++ b/ports/geckolib/Cargo.lock
@@ -272,7 +272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -428,7 +428,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 5daa08ac0f0..032c5ed4420 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -1387,7 +1387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1926,7 +1926,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
diff --git a/rust-nightly-date b/rust-nightly-date
index c20499153e4..b1b26f7a977 100644
--- a/rust-nightly-date
+++ b/rust-nightly-date
@@ -1 +1 @@
-2016-03-18
+2016-04-06