corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #7698 - sorted the declarations in various files (from Wafflespeanut:sorting); r=frewsxcv

Browse Source 
This is a direct extract from my abandoned PR for a lint (#7546), along with some rather clumsy modifications (only on `components/script/dom/mod.rs` and `components/style/lib.rs`), because I had to sort some of the files again to make peace with tidy, which hasn't been educated about sorting yet!

Source-Repo: https://github.com/servo/servo
Source-Revision: a7208869f2903e36f9b2f540b55b50283d7df466
This commit is contained in:
Ravi Shankar
2015-09-23 15:02:56 -06:00
parent b23db09565
commit 62e8ea2732
194 changed files with 804 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
servo/components/msg/compositor_msg.rs
View File

@@ -3,15 +3,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use azure::azure_hl::Color;
use constellation_msg::PipelineId;
use constellation_msg::{Key, KeyState, KeyModifiers};
use euclid::Matrix4;
use euclid::{Size2D, Point2D, Rect};
use constellation_msg::{Key, KeyModifiers, KeyState, PipelineId};
use euclid::{Matrix4, Point2D, Rect, Size2D};
use ipc_channel::ipc::IpcSender;
use layers::layers::{BufferRequest, LayerBufferSet};
use layers::platform::surface::NativeDisplay;
use std::fmt;
use std::fmt::{Formatter, Debug};
use std::fmt::{self, Debug, Formatter};
/// A newtype struct for denoting the age of messages; prevents race conditions.
#[derive(PartialEq, Eq, Debug, Copy, Clone, PartialOrd, Ord, Deserialize, Serialize)]

4
servo/components/msg/constellation_msg.rs
View File

@@ -17,13 +17,13 @@ use layers::geometry::DevicePixel;
use offscreen_gl_context::GLContextAttributes;
use png::Image;
use std::collections::HashMap;
use std::sync::mpsc::{channel, Sender, Receiver};
use std::sync::mpsc::{Receiver, Sender, channel};
use style_traits::viewport::ViewportConstraints;
use url::Url;
use util::cursor::Cursor;
use util::geometry::{PagePx, ViewportPx};
use util::mem::HeapSizeOf;
use webdriver_msg::{WebDriverScriptCommand, LoadStatus};
use webdriver_msg::{LoadStatus, WebDriverScriptCommand};
#[derive(Clone)]
pub struct ConstellationChan(pub Sender<Msg>);

16
servo/components/msg/lib.rs
View File

@@ -5,25 +5,25 @@
#![feature(custom_derive, plugin)]
#![plugin(serde_macros, plugins)]
#[macro_use]
extern crate bitflags;
extern crate azure;
#[macro_use] extern crate bitflags;
extern crate canvas_traits;
#[cfg(target_os = "macos")]
extern crate core_foundation;
extern crate euclid;
extern crate hyper;
#[cfg(target_os = "macos")]
extern crate io_surface;
extern crate ipc_channel;
extern crate layers;
extern crate offscreen_gl_context;
extern crate png;
extern crate rustc_serialize;
extern crate serde;
extern crate util;
extern crate url;
extern crate style_traits;
#[cfg(target_os = "macos")]
extern crate core_foundation;
#[cfg(target_os = "macos")]
extern crate io_surface;
extern crate url;
extern crate util;
pub mod compositor_msg;
pub mod constellation_msg;