diff options
| -rw-r--r-- | components/plugins/lints/transmute_type.rs | 5 | ||||
| -rw-r--r-- | components/plugins/lints/unrooted_must_root.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 3 | ||||
| -rw-r--r-- | rust-nightly-date | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/components/plugins/lints/transmute_type.rs b/components/plugins/lints/transmute_type.rs index 1488aaa9a74..15e760291f9 100644 --- a/components/plugins/lints/transmute_type.rs +++ b/components/plugins/lints/transmute_type.rs @@ -29,11 +29,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TransmutePass { if path.segments.last() .map_or(false, |ref segment| &*segment.name.as_str() == "transmute") && args.len() == 1 { - let tcx = cx.tcx; cx.span_lint(TRANSMUTE_TYPE_LINT, ex.span, &format!("Transmute to {:?} from {:?} detected", - tcx.tables().expr_ty(ex), - tcx.tables().expr_ty(&args.get(0).unwrap()) + cx.tables.expr_ty(ex), + cx.tables.expr_ty(&args.get(0).unwrap()) )); } } diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index 380e239fed2..e16a88fe898 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -169,7 +169,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { let cx = self.cx; fn require_rooted(cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr) { - let ty = cx.tcx.tables().expr_ty(&subexpr); + let ty = cx.tables.expr_ty(&subexpr); if is_unrooted_ty(cx, ty, in_new_function) { cx.span_lint(UNROOTED_MUST_ROOT, subexpr.span, @@ -203,7 +203,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { let cx = self.cx; if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node { - let ty = cx.tcx.tables().pat_ty(pat); + let ty = cx.tables.pat_ty(pat); if is_unrooted_ty(cx, ty, self.in_new_function) { cx.span_lint(UNROOTED_MUST_ROOT, pat.span, diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 9ad852286a7..96983b36ecf 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -40,7 +40,8 @@ use encoding::all::UTF_8; use encoding::label::encoding_from_whatwg_label; use encoding::types::{DecoderTrap, EncoderTrap, Encoding, EncodingRef}; use euclid::length::Length; -use html5ever::serialize::{self, SerializeOpts}; +use html5ever::serialize; +use html5ever::serialize::SerializeOpts; use hyper::header::{ContentLength, ContentType}; use hyper::header::Headers; use hyper::method::Method; diff --git a/rust-nightly-date b/rust-nightly-date index 1892edf983e..db017a3d33f 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2017-01-06 +2017-01-12 |