mirror of
https://github.com/servo/servo.git
synced 2025-08-02 12:10:29 +01:00
Upgrade to rustc 1.6.0-nightly (1805bba39 2015-11-26)
This commit is contained in:
parent
a515fe320b
commit
8d7d132c93
7 changed files with 50 additions and 49 deletions
|
@ -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};
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue