Auto merge of #8698 - servo:rustup_2015-11-26, r=Manishearth

Upgrade to rustc 1.6.0-nightly (1805bba39 2015-11-26)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8698)
<!-- Reviewable:end -->

components/plugins/lints/unrooted_must_root.rs

@@ -5,7 +5,8 @@
 use rustc::front::map as ast_map;
 use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
 use rustc::middle::ty;
-use rustc_front::{hir, visit};
+use rustc_front::hir;
+use rustc_front::intravisit as visit;
 use syntax::attr::AttrMetaMethods;
 use syntax::{ast, codemap};
 use utils::{match_def_path, in_derive_expn};

components/plugins/url_plugin.rs

@@ -16,7 +16,7 @@ use url::{Url, Host, RelativeSchemeData, SchemeData};
 pub fn expand_url(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
         -> Box<MacResult + 'static> {
     let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_vec());
-    let query_expr = cx.expander().fold_expr(parser.parse_expr_nopanic().unwrap());
+    let query_expr = cx.expander().fold_expr(parser.parse_expr().unwrap());
 
     // Ensure a str literal was passed to the macro
     let query = match parse_str_lit(&query_expr) {

components/plugins/utils.rs

@@ -76,7 +76,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
     match map.find(map.get_parent(id)) {
         Some(ast_map::NodeImplItem(itm)) => {
             match itm.node {
-                hir::MethodImplItem(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe,
+                hir::ImplItemKind::Method(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe,
                 _ => false
             }
         },

rust-snapshot-hash

@@ -1 +1 @@
-2015-11-13
+2015-11-26