mirror of
https://github.com/servo/servo.git
synced 2025-06-20 15:18:58 +01:00
Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15).
This commit is contained in:
parent
01b6ad55bd
commit
5618e79768
10 changed files with 29 additions and 21 deletions
6
Cargo.lock
generated
6
Cargo.lock
generated
|
@ -369,12 +369,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
name = "compiletest_helper"
|
name = "compiletest_helper"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
"compiletest_rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "compiletest_rs"
|
name = "compiletest_rs"
|
||||||
version = "0.2.4"
|
version = "0.2.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -3314,7 +3314,7 @@ dependencies = [
|
||||||
"checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978"
|
"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 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 color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d"
|
||||||
"checksum compiletest_rs 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "28d60af0dbee4912f00dda79ac3b06d1ca44b641d69359e6f1d4df7c985521d2"
|
"checksum compiletest_rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f3f344389765ad7bec166f64c1b39ed6dd2b54d81c4c5dd8af789169351d380c"
|
||||||
"checksum content-blocker 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b0d86cb81505503bbfb0d47cf7e12be2e69205a75e70c4da84998e39b96b7f1"
|
"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 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"
|
"checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd"
|
||||||
|
|
|
@ -22,7 +22,7 @@ impl LintPass for InheritancePass {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LateLintPass for InheritancePass {
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InheritancePass {
|
||||||
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
|
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
|
||||||
_gen: &hir::Generics, id: ast::NodeId) {
|
_gen: &hir::Generics, id: ast::NodeId) {
|
||||||
// Lints are run post expansion, so it's fine to use
|
// Lints are run post expansion, so it's fine to use
|
||||||
|
|
|
@ -21,7 +21,7 @@ impl LintPass for PrivatizePass {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LateLintPass for PrivatizePass {
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for PrivatizePass {
|
||||||
fn check_struct_def(&mut self,
|
fn check_struct_def(&mut self,
|
||||||
cx: &LateContext,
|
cx: &LateContext,
|
||||||
def: &hir::VariantData,
|
def: &hir::VariantData,
|
||||||
|
|
|
@ -20,7 +20,7 @@ impl LintPass for TransmutePass {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LateLintPass for TransmutePass {
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TransmutePass {
|
||||||
fn check_expr(&mut self, cx: &LateContext, ex: &hir::Expr) {
|
fn check_expr(&mut self, cx: &LateContext, ex: &hir::Expr) {
|
||||||
match ex.node {
|
match ex.node {
|
||||||
hir::ExprCall(ref expr, ref args) => {
|
hir::ExprCall(ref expr, ref args) => {
|
||||||
|
|
|
@ -76,7 +76,7 @@ impl LintPass for UnrootedPass {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LateLintPass for UnrootedPass {
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
|
||||||
/// All structs containing #[must_root] types must be #[must_root] themselves
|
/// All structs containing #[must_root] types must be #[must_root] themselves
|
||||||
fn check_struct_def(&mut self,
|
fn check_struct_def(&mut self,
|
||||||
cx: &LateContext,
|
cx: &LateContext,
|
||||||
|
@ -119,8 +119,13 @@ impl LateLintPass for UnrootedPass {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// Function arguments that are #[must_root] types are not allowed
|
/// Function arguments that are #[must_root] types are not allowed
|
||||||
fn check_fn(&mut self, cx: &LateContext, kind: visit::FnKind, decl: &hir::FnDecl,
|
fn check_fn(&mut self,
|
||||||
body: &hir::Expr, span: codemap::Span, id: ast::NodeId) {
|
cx: &LateContext<'a, 'tcx>,
|
||||||
|
kind: visit::FnKind,
|
||||||
|
decl: &'tcx hir::FnDecl,
|
||||||
|
body: &'tcx hir::Expr,
|
||||||
|
span: codemap::Span,
|
||||||
|
id: ast::NodeId) {
|
||||||
let in_new_function = match kind {
|
let in_new_function = match kind {
|
||||||
visit::FnKind::ItemFn(n, _, _, _, _, _, _) |
|
visit::FnKind::ItemFn(n, _, _, _, _, _, _) |
|
||||||
visit::FnKind::Method(n, _, _, _) => {
|
visit::FnKind::Method(n, _, _, _) => {
|
||||||
|
@ -159,8 +164,8 @@ struct FnDefVisitor<'a, 'b: 'a, 'tcx: 'a+'b> {
|
||||||
in_new_function: bool,
|
in_new_function: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx> {
|
impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
|
||||||
fn visit_expr(&mut self, expr: &'a hir::Expr) {
|
fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
|
||||||
let cx = self.cx;
|
let cx = self.cx;
|
||||||
|
|
||||||
fn require_rooted(cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr) {
|
fn require_rooted(cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr) {
|
||||||
|
@ -194,7 +199,7 @@ impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx>
|
||||||
visit::walk_expr(self, expr);
|
visit::walk_expr(self, expr);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_pat(&mut self, pat: &'a hir::Pat) {
|
fn visit_pat(&mut self, pat: &'tcx hir::Pat) {
|
||||||
let cx = self.cx;
|
let cx = self.cx;
|
||||||
|
|
||||||
if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node {
|
if let hir::PatKind::Binding(hir::BindingMode::BindByValue(_), _, _, _) = pat.node {
|
||||||
|
@ -209,13 +214,16 @@ impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx>
|
||||||
visit::walk_pat(self, pat);
|
visit::walk_pat(self, pat);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_fn(&mut self, kind: visit::FnKind<'a>, decl: &'a hir::FnDecl,
|
fn visit_fn(&mut self, kind: visit::FnKind<'tcx>, decl: &'tcx hir::FnDecl,
|
||||||
body: &'a hir::Expr, span: codemap::Span, id: ast::NodeId) {
|
body: hir::ExprId, span: codemap::Span, id: ast::NodeId) {
|
||||||
if let visit::FnKind::Closure(_) = kind {
|
if let visit::FnKind::Closure(_) = kind {
|
||||||
visit::walk_fn(self, kind, decl, body, span, id);
|
visit::walk_fn(self, kind, decl, body, span, id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_foreign_item(&mut self, _: &'a hir::ForeignItem) {}
|
fn visit_foreign_item(&mut self, _: &'tcx hir::ForeignItem) {}
|
||||||
fn visit_ty(&mut self, _: &'a hir::Ty) { }
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,9 @@ extern crate euclid;
|
||||||
extern crate gfx_traits;
|
extern crate gfx_traits;
|
||||||
extern crate gleam;
|
extern crate gleam;
|
||||||
extern crate glutin_app;
|
extern crate glutin_app;
|
||||||
extern crate rustc_unicode;
|
|
||||||
extern crate script_traits;
|
extern crate script_traits;
|
||||||
extern crate servo_url;
|
extern crate servo_url;
|
||||||
|
extern crate std_unicode;
|
||||||
extern crate style_traits;
|
extern crate style_traits;
|
||||||
|
|
||||||
extern crate net_traits;
|
extern crate net_traits;
|
||||||
|
|
|
@ -7,7 +7,7 @@ use std::slice;
|
||||||
use string::cef_string_utf16_set;
|
use string::cef_string_utf16_set;
|
||||||
use types::{cef_string_list_t,cef_string_t};
|
use types::{cef_string_list_t,cef_string_t};
|
||||||
|
|
||||||
use rustc_unicode::str::Utf16Encoder;
|
use std_unicode::str::Utf16Encoder;
|
||||||
|
|
||||||
//cef_string_list
|
//cef_string_list
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ use eutil::Downcast;
|
||||||
use interfaces::CefApp;
|
use interfaces::CefApp;
|
||||||
use interfaces::CefBrowser;
|
use interfaces::CefBrowser;
|
||||||
use render_handler::CefRenderHandlerExtensions;
|
use render_handler::CefRenderHandlerExtensions;
|
||||||
use rustc_unicode::str::Utf16Encoder;
|
use std_unicode::str::Utf16Encoder;
|
||||||
use types::{cef_cursor_handle_t, cef_cursor_type_t, cef_rect_t};
|
use types::{cef_cursor_handle_t, cef_cursor_type_t, cef_rect_t};
|
||||||
use wrappers::CefWrap;
|
use wrappers::CefWrap;
|
||||||
|
|
||||||
|
|
|
@ -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_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_geolocation_handler_t, cef_jsdialog_handler_t, cef_keyboard_handler_t};
|
||||||
use interfaces::{cef_load_handler_t, cef_request_handler_t};
|
use interfaces::{cef_load_handler_t, cef_request_handler_t};
|
||||||
use rustc_unicode::str::Utf16Encoder;
|
use std_unicode::str::Utf16Encoder;
|
||||||
use types::{cef_base_t, cef_browser_settings_t, CefBrowserSettings, cef_color_model_t};
|
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_edit_state_flags_t};
|
||||||
use types::{cef_context_menu_media_state_flags_t};
|
use types::{cef_context_menu_media_state_flags_t};
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2016-11-29
|
2016-12-16
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue