diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-19 03:58:56 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 03:58:56 -0800 |
commit | 077a54de19ad6336cc6fae5fb4d9897535f67c2b (patch) | |
tree | 4a9f5884cc8e2ae8faca5e98bacd5f8ad6dbf639 /ports | |
parent | cb6a870077fc6bca98af688406926832ae3df038 (diff) | |
parent | 5618e797683e7bfc400e8b1879d89f64bfb577fa (diff) | |
download | servo-077a54de19ad6336cc6fae5fb4d9897535f67c2b.tar.gz servo-077a54de19ad6336cc6fae5fb4d9897535f67c2b.zip |
Auto merge of #14481 - servo:rustup, r=Ms2ger
Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15).
<!-- 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/14481)
<!-- Reviewable:end -->
Diffstat (limited to 'ports')
-rw-r--r-- | ports/cef/lib.rs | 2 | ||||
-rw-r--r-- | ports/cef/string_list.rs | 2 | ||||
-rw-r--r-- | ports/cef/window.rs | 2 | ||||
-rw-r--r-- | ports/cef/wrappers.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index e270267b905..b4d09379055 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 90ada69267a..5c0b94d96bc 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 rustc_unicode::str::Utf16Encoder; +use std_unicode::str::Utf16Encoder; //cef_string_list diff --git a/ports/cef/window.rs b/ports/cef/window.rs index f84c0b90d1f..7ef1c99c2de 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 rustc_unicode::str::Utf16Encoder; +use std_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 fdb2bb96063..c1a887ac28c 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 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_context_menu_edit_state_flags_t}; use types::{cef_context_menu_media_state_flags_t}; |