aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock6
-rw-r--r--components/plugins/lints/inheritance_integrity.rs2
-rw-r--r--components/plugins/lints/privatize.rs2
-rw-r--r--components/plugins/lints/transmute_type.rs2
-rw-r--r--components/plugins/lints/unrooted_must_root.rs28
-rw-r--r--ports/cef/lib.rs2
-rw-r--r--ports/cef/string_list.rs2
-rw-r--r--ports/cef/window.rs2
-rw-r--r--ports/cef/wrappers.rs2
-rw-r--r--rust-nightly-date2
10 files changed, 21 insertions, 29 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 95dac87533c..89e3660c7cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -368,12 +368,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "compiletest_helper"
version = "0.0.1"
dependencies = [
- "compiletest_rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "compiletest_rs"
-version = "0.2.5"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3342,7 +3342,7 @@ dependencies = [
"checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978"
"checksum cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d24ed9a15e9c0892cdb20c7acc3e50441501b990ee6dc318c176981829a7941"
"checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d"
-"checksum compiletest_rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f3f344389765ad7bec166f64c1b39ed6dd2b54d81c4c5dd8af789169351d380c"
+"checksum compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "28d60af0dbee4912f00dda79ac3b06d1ca44b641d69359e6f1d4df7c985521d2"
"checksum content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0d86cb81505503bbfb0d47cf7e12be2e69205a75e70c4da84998e39b96b7f1"
"checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626"
"checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd"
diff --git a/components/plugins/lints/inheritance_integrity.rs b/components/plugins/lints/inheritance_integrity.rs
index 0c70a949c15..a47b6313db0 100644
--- a/components/plugins/lints/inheritance_integrity.rs
+++ b/components/plugins/lints/inheritance_integrity.rs
@@ -22,7 +22,7 @@ impl LintPass for InheritancePass {
}
}
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InheritancePass {
+impl LateLintPass for InheritancePass {
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
_gen: &hir::Generics, id: ast::NodeId) {
// Lints are run post expansion, so it's fine to use
diff --git a/components/plugins/lints/privatize.rs b/components/plugins/lints/privatize.rs
index 0eec1ad1596..f3f56a0cdc4 100644
--- a/components/plugins/lints/privatize.rs
+++ b/components/plugins/lints/privatize.rs
@@ -21,7 +21,7 @@ impl LintPass for PrivatizePass {
}
}
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for PrivatizePass {
+impl LateLintPass for PrivatizePass {
fn check_struct_def(&mut self,
cx: &LateContext,
def: &hir::VariantData,
diff --git a/components/plugins/lints/transmute_type.rs b/components/plugins/lints/transmute_type.rs
index 1488aaa9a74..6cc1b3818a6 100644
--- a/components/plugins/lints/transmute_type.rs
+++ b/components/plugins/lints/transmute_type.rs
@@ -20,7 +20,7 @@ impl LintPass for TransmutePass {
}
}
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TransmutePass {
+impl LateLintPass for TransmutePass {
fn check_expr(&mut self, cx: &LateContext, ex: &hir::Expr) {
match ex.node {
hir::ExprCall(ref expr, ref args) => {
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index 328b143593b..a2ce68c522b 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/components/plugins/lints/unrooted_must_root.rs
@@ -76,7 +76,7 @@ impl LintPass for UnrootedPass {
}
}
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
+impl LateLintPass for UnrootedPass {
/// All structs containing #[must_root] types must be #[must_root] themselves
fn check_struct_def(&mut self,
cx: &LateContext,
@@ -119,13 +119,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
}
}
/// Function arguments that are #[must_root] types are not allowed
- fn check_fn(&mut self,
- cx: &LateContext<'a, 'tcx>,
- kind: visit::FnKind,
- decl: &'tcx hir::FnDecl,
- body: &'tcx hir::Expr,
- span: codemap::Span,
- id: ast::NodeId) {
+ fn check_fn(&mut self, cx: &LateContext, kind: visit::FnKind, decl: &hir::FnDecl,
+ body: &hir::Expr, span: codemap::Span, id: ast::NodeId) {
let in_new_function = match kind {
visit::FnKind::ItemFn(n, _, _, _, _, _, _) |
visit::FnKind::Method(n, _, _, _) => {
@@ -164,8 +159,8 @@ struct FnDefVisitor<'a, 'b: 'a, 'tcx: 'a+'b> {
in_new_function: bool,
}
-impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
- fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
+impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx> {
+ fn visit_expr(&mut self, expr: &'a hir::Expr) {
let cx = self.cx;
fn require_rooted(cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr) {
@@ -199,7 +194,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
visit::walk_expr(self, expr);
}
- fn visit_pat(&mut self, pat: &'tcx hir::Pat) {
+ fn visit_pat(&mut self, pat: &'a hir::Pat) {
let cx = self.cx;
if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node {
@@ -214,16 +209,13 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
visit::walk_pat(self, pat);
}
- fn visit_fn(&mut self, kind: visit::FnKind<'tcx>, decl: &'tcx hir::FnDecl,
- body: hir::ExprId, span: codemap::Span, id: ast::NodeId) {
+ fn visit_fn(&mut self, kind: visit::FnKind<'a>, decl: &'a hir::FnDecl,
+ body: &'a hir::Expr, span: codemap::Span, id: ast::NodeId) {
if let visit::FnKind::Closure(_) = kind {
visit::walk_fn(self, kind, decl, body, span, id);
}
}
- fn visit_foreign_item(&mut self, _: &'tcx hir::ForeignItem) {}
- fn visit_ty(&mut self, _: &'tcx hir::Ty) { }
- fn nested_visit_map<'this>(&'this mut self) -> hir::intravisit::NestedVisitorMap<'this, 'tcx> {
- hir::intravisit::NestedVisitorMap::OnlyBodies(&self.cx.tcx.map)
- }
+ fn visit_foreign_item(&mut self, _: &'a hir::ForeignItem) {}
+ fn visit_ty(&mut self, _: &'a hir::Ty) { }
}
diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs
index b4d09379055..e270267b905 100644
--- a/ports/cef/lib.rs
+++ b/ports/cef/lib.rs
@@ -22,11 +22,11 @@ extern crate euclid;
extern crate gfx_traits;
extern crate gleam;
extern crate glutin_app;
+extern crate rustc_unicode;
extern crate script_traits;
extern crate servo_config;
extern crate servo_geometry;
extern crate servo_url;
-extern crate std_unicode;
extern crate style_traits;
extern crate net_traits;
diff --git a/ports/cef/string_list.rs b/ports/cef/string_list.rs
index 5c0b94d96bc..90ada69267a 100644
--- a/ports/cef/string_list.rs
+++ b/ports/cef/string_list.rs
@@ -7,7 +7,7 @@ use std::slice;
use string::cef_string_utf16_set;
use types::{cef_string_list_t,cef_string_t};
-use std_unicode::str::Utf16Encoder;
+use rustc_unicode::str::Utf16Encoder;
//cef_string_list
diff --git a/ports/cef/window.rs b/ports/cef/window.rs
index 7ef1c99c2de..f84c0b90d1f 100644
--- a/ports/cef/window.rs
+++ b/ports/cef/window.rs
@@ -14,7 +14,7 @@ use eutil::Downcast;
use interfaces::CefApp;
use interfaces::CefBrowser;
use render_handler::CefRenderHandlerExtensions;
-use std_unicode::str::Utf16Encoder;
+use rustc_unicode::str::Utf16Encoder;
use types::{cef_cursor_handle_t, cef_cursor_type_t, cef_rect_t};
use wrappers::CefWrap;
diff --git a/ports/cef/wrappers.rs b/ports/cef/wrappers.rs
index c1a887ac28c..fdb2bb96063 100644
--- a/ports/cef/wrappers.rs
+++ b/ports/cef/wrappers.rs
@@ -8,7 +8,7 @@ use interfaces::{cef_dialog_handler_t, cef_focus_handler_t};
use interfaces::{cef_download_handler_t, cef_drag_handler_t, cef_context_menu_handler_t};
use interfaces::{cef_geolocation_handler_t, cef_jsdialog_handler_t, cef_keyboard_handler_t};
use interfaces::{cef_load_handler_t, cef_request_handler_t};
-use std_unicode::str::Utf16Encoder;
+use rustc_unicode::str::Utf16Encoder;
use types::{cef_base_t, cef_browser_settings_t, CefBrowserSettings, cef_color_model_t};
use types::{cef_context_menu_edit_state_flags_t};
use types::{cef_context_menu_media_state_flags_t};
diff --git a/rust-nightly-date b/rust-nightly-date
index b972f50d4fd..1cd945ea8b5 100644
--- a/rust-nightly-date
+++ b/rust-nightly-date
@@ -1 +1 @@
-2016-12-16
+2016-11-29
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 18:13:45 +0000