mirror of
https://github.com/servo/servo.git
synced 2025-08-23 06:15:35 +01:00
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 -->
This commit is contained in:
commit
077a54de19
10 changed files with 29 additions and 21 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue