aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-12 16:07:54 -0800
committerGitHub <noreply@github.com>2017-01-12 16:07:54 -0800
commit38fccce3ba512bbf7100574e225d73f538fad5f0 (patch)
treef965d426286270bec84288891775712cded131a5 /components
parenta379b17b4aefc10172b0c455743f5f1f710f6fea (diff)
parent5cf10622bb5ae45d5936165d2ff457cfbc022700 (diff)
downloadservo-38fccce3ba512bbf7100574e225d73f538fad5f0.tar.gz
servo-38fccce3ba512bbf7100574e225d73f538fad5f0.zip
Auto merge of #14992 - servo:rustup, r=jdm
Upgrade to rustc 1.16.0-nightly (2782e8f8f 2017-01-12) <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14992) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/plugins/lints/transmute_type.rs5
-rw-r--r--components/plugins/lints/unrooted_must_root.rs4
-rw-r--r--components/script/dom/xmlhttprequest.rs3
3 files changed, 6 insertions, 6 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;