Issue #7390 correct the order of mod declaration

This commit is contained in:
Hugo Thiessard 2015-09-18 22:02:04 +02:00
parent e81e91207c
commit 6565e7b02f
11 changed files with 53 additions and 55 deletions

View file

@ -49,11 +49,11 @@ pub use constellation::Constellation;
pub mod compositor_task; pub mod compositor_task;
mod surface_map;
mod compositor_layer;
mod compositor; mod compositor;
mod compositor_layer;
mod headless; mod headless;
mod scrolling; mod scrolling;
mod surface_map;
pub mod pipeline; pub mod pipeline;
pub mod constellation; pub mod constellation;

View file

@ -85,8 +85,8 @@ pub mod paint_task;
// Fonts // Fonts
pub mod font; pub mod font;
pub mod font_context;
pub mod font_cache_task; pub mod font_cache_task;
pub mod font_context;
pub mod font_template; pub mod font_template;
// Misc. // Misc.

View file

@ -79,9 +79,9 @@ pub mod flow_list;
pub mod flow_ref; pub mod flow_ref;
pub mod fragment; pub mod fragment;
pub mod generated_content; pub mod generated_content;
pub mod layout_task;
pub mod incremental; pub mod incremental;
pub mod inline; pub mod inline;
pub mod layout_task;
pub mod list_item; pub mod list_item;
pub mod model; pub mod model;
pub mod multicol; pub mod multicol;
@ -89,13 +89,13 @@ pub mod opaque_node;
pub mod parallel; pub mod parallel;
pub mod query; pub mod query;
pub mod sequential; pub mod sequential;
pub mod table_wrapper;
pub mod table; pub mod table;
pub mod table_caption; pub mod table_caption;
pub mod table_colgroup;
pub mod table_rowgroup;
pub mod table_row;
pub mod table_cell; pub mod table_cell;
pub mod table_colgroup;
pub mod table_row;
pub mod table_rowgroup;
pub mod table_wrapper;
pub mod text; pub mod text;
pub mod traversal; pub mod traversal;
pub mod wrapper; pub mod wrapper;

View file

@ -27,22 +27,22 @@ extern crate url;
extern crate uuid; extern crate uuid;
pub mod about_loader; pub mod about_loader;
pub mod file_loader;
pub mod http_loader;
pub mod data_loader;
pub mod cookie; pub mod cookie;
pub mod cookie_storage; pub mod cookie_storage;
pub mod data_loader;
pub mod file_loader;
pub mod hsts;
pub mod http_loader;
pub mod image_cache_task; pub mod image_cache_task;
pub mod mime_classifier;
pub mod pub_domains; pub mod pub_domains;
pub mod resource_task; pub mod resource_task;
pub mod hsts;
pub mod storage_task; pub mod storage_task;
pub mod mime_classifier;
/// An implementation of the [Fetch spec](https://fetch.spec.whatwg.org/) /// An implementation of the [Fetch spec](https://fetch.spec.whatwg.org/)
pub mod fetch { pub mod fetch {
#![allow(dead_code, unused)] // XXXManishearth this is only temporary until the Fetch mod starts being used #![allow(dead_code, unused)] // XXXManishearth this is only temporary until the Fetch mod starts being used
pub mod cors_cache;
pub mod request; pub mod request;
pub mod response; pub mod response;
pub mod cors_cache;
} }

View file

@ -37,11 +37,11 @@ pub mod jstraceable;
/// Handles the auto-deriving for `#[derive(HeapSizeOf)]` /// Handles the auto-deriving for `#[derive(HeapSizeOf)]`
pub mod heap_size; pub mod heap_size;
/// Autogenerates implementations of Reflectable on DOM structs /// Autogenerates implementations of Reflectable on DOM structs
pub mod reflector;
pub mod lints; pub mod lints;
pub mod reflector;
/// Utilities for writing plugins /// Utilities for writing plugins
pub mod utils;
pub mod casing; pub mod casing;
pub mod utils;
#[plugin_registrar] #[plugin_registrar]
pub fn plugin_registrar(reg: &mut Registry) { pub fn plugin_registrar(reg: &mut Registry) {

View file

@ -135,19 +135,19 @@
#![allow(unsafe_code)] #![allow(unsafe_code)]
#![deny(missing_docs, non_snake_case)] #![deny(missing_docs, non_snake_case)]
pub mod callback;
pub mod cell; pub mod cell;
pub mod conversions;
pub mod error;
pub mod global; pub mod global;
pub mod js; pub mod js;
pub mod refcounted;
pub mod utils;
pub mod callback;
pub mod error;
pub mod conversions;
pub mod proxyhandler;
pub mod num; pub mod num;
pub mod proxyhandler;
pub mod refcounted;
pub mod str; pub mod str;
pub mod structuredclone; pub mod structuredclone;
pub mod trace; pub mod trace;
pub mod utils;
/// Generated JS-Rust bindings. /// Generated JS-Rust bindings.
#[allow(missing_docs, non_snake_case)] #[allow(missing_docs, non_snake_case)]
@ -179,4 +179,3 @@ pub mod codegen {
include!(concat!(env!("OUT_DIR"), "/UnionTypes.rs")); include!(concat!(env!("OUT_DIR"), "/UnionTypes.rs"));
} }
} }

View file

@ -199,18 +199,13 @@ pub mod canvasgradient;
pub mod canvaspattern; pub mod canvaspattern;
pub mod canvasrenderingcontext2d; pub mod canvasrenderingcontext2d;
pub mod characterdata; pub mod characterdata;
pub mod css;
pub mod cssstyledeclaration;
pub mod dompoint;
pub mod dompointreadonly;
pub mod domrect;
pub mod domrectlist;
pub mod domstringmap;
pub mod closeevent; pub mod closeevent;
pub mod comment; pub mod comment;
pub mod console; pub mod console;
mod create; mod create;
pub mod crypto; pub mod crypto;
pub mod css;
pub mod cssstyledeclaration;
pub mod customevent; pub mod customevent;
pub mod dedicatedworkerglobalscope; pub mod dedicatedworkerglobalscope;
pub mod document; pub mod document;
@ -219,6 +214,11 @@ pub mod documenttype;
pub mod domexception; pub mod domexception;
pub mod domimplementation; pub mod domimplementation;
pub mod domparser; pub mod domparser;
pub mod dompoint;
pub mod dompointreadonly;
pub mod domrect;
pub mod domrectlist;
pub mod domstringmap;
pub mod domtokenlist; pub mod domtokenlist;
pub mod element; pub mod element;
pub mod errorevent; pub mod errorevent;
@ -280,15 +280,15 @@ pub mod htmlprogresselement;
pub mod htmlquoteelement; pub mod htmlquoteelement;
pub mod htmlscriptelement; pub mod htmlscriptelement;
pub mod htmlselectelement; pub mod htmlselectelement;
pub mod htmlspanelement;
pub mod htmlsourceelement; pub mod htmlsourceelement;
pub mod htmlspanelement;
pub mod htmlstyleelement; pub mod htmlstyleelement;
pub mod htmltableelement;
pub mod htmltablecaptionelement; pub mod htmltablecaptionelement;
pub mod htmltablecellelement; pub mod htmltablecellelement;
pub mod htmltabledatacellelement;
pub mod htmltableheadercellelement;
pub mod htmltablecolelement; pub mod htmltablecolelement;
pub mod htmltabledatacellelement;
pub mod htmltableelement;
pub mod htmltableheadercellelement;
pub mod htmltablerowelement; pub mod htmltablerowelement;
pub mod htmltablesectionelement; pub mod htmltablesectionelement;
pub mod htmltemplateelement; pub mod htmltemplateelement;
@ -297,8 +297,8 @@ pub mod htmltimeelement;
pub mod htmltitleelement; pub mod htmltitleelement;
pub mod htmltrackelement; pub mod htmltrackelement;
pub mod htmlulistelement; pub mod htmlulistelement;
pub mod htmlvideoelement;
pub mod htmlunknownelement; pub mod htmlunknownelement;
pub mod htmlvideoelement;
pub mod imagedata; pub mod imagedata;
pub mod keyboardevent; pub mod keyboardevent;
pub mod location; pub mod location;
@ -310,9 +310,9 @@ pub mod navigatorinfo;
pub mod node; pub mod node;
pub mod nodeiterator; pub mod nodeiterator;
pub mod nodelist; pub mod nodelist;
pub mod processinginstruction;
pub mod performance; pub mod performance;
pub mod performancetiming; pub mod performancetiming;
pub mod processinginstruction;
pub mod progressevent; pub mod progressevent;
pub mod range; pub mod range;
pub mod screen; pub mod screen;
@ -330,17 +330,17 @@ pub mod urlsearchparams;
pub mod userscripts; pub mod userscripts;
pub mod validitystate; pub mod validitystate;
pub mod virtualmethods; pub mod virtualmethods;
pub mod webglobject; pub mod webglactiveinfo;
pub mod webglbuffer; pub mod webglbuffer;
pub mod webglframebuffer;
pub mod webglobject;
pub mod webglprogram; pub mod webglprogram;
pub mod webglrenderbuffer;
pub mod webglrenderingcontext; pub mod webglrenderingcontext;
pub mod webglshader; pub mod webglshader;
pub mod webgluniformlocation;
pub mod webgltexture;
pub mod webglframebuffer;
pub mod webglrenderbuffer;
pub mod webglactiveinfo;
pub mod webglshaderprecisionformat; pub mod webglshaderprecisionformat;
pub mod webgltexture;
pub mod webgluniformlocation;
pub mod websocket; pub mod websocket;
pub mod window; pub mod window;
pub mod worker; pub mod worker;

View file

@ -91,16 +91,16 @@ pub mod dom;
pub mod parse; pub mod parse;
pub mod clipboard_provider;
mod devtools;
mod horribly_inefficient_timers;
pub mod layout_interface; pub mod layout_interface;
mod mem; mod mem;
mod network_listener; mod network_listener;
pub mod page; pub mod page;
pub mod script_task; pub mod script_task;
mod timers;
pub mod textinput; pub mod textinput;
pub mod clipboard_provider; mod timers;
mod devtools;
mod horribly_inefficient_timers;
mod webdriver_handlers; mod webdriver_handlers;
use dom::bindings::codegen::RegisterBindings; use dom::bindings::codegen::RegisterBindings;

View file

@ -47,9 +47,9 @@ extern crate util;
extern crate style_traits; extern crate style_traits;
mod custom_properties; mod custom_properties;
pub mod stylesheets;
pub mod parser; pub mod parser;
pub mod selector_matching; pub mod selector_matching;
pub mod stylesheets;
#[macro_use] pub mod values; #[macro_use] pub mod values;
// Generated from the properties.mako.rs template by build.rs // Generated from the properties.mako.rs template by build.rs
@ -58,11 +58,11 @@ pub mod properties {
include!(concat!(env!("OUT_DIR"), "/properties.rs")); include!(concat!(env!("OUT_DIR"), "/properties.rs"));
} }
pub mod node; pub mod animation;
pub mod media_queries;
pub mod font_face; pub mod font_face;
pub mod legacy; pub mod legacy;
pub mod animation; pub mod media_queries;
pub mod node;
pub mod viewport; pub mod viewport;
macro_rules! reexport_computed_values { macro_rules! reexport_computed_values {

View file

@ -53,9 +53,9 @@ pub mod cache;
pub mod cursor; pub mod cursor;
pub mod debug_utils; pub mod debug_utils;
pub mod deque; pub mod deque;
pub mod linked_list;
pub mod geometry; pub mod geometry;
pub mod ipc; pub mod ipc;
pub mod linked_list;
pub mod logical_geometry; pub mod logical_geometry;
pub mod mem; pub mod mem;
pub mod opts; pub mod opts;
@ -66,9 +66,9 @@ pub mod range;
pub mod resource_files; pub mod resource_files;
pub mod str; pub mod str;
pub mod task; pub mod task;
pub mod tid;
pub mod taskpool;
pub mod task_state; pub mod task_state;
pub mod taskpool;
pub mod tid;
pub mod vec; pub mod vec;
pub mod workqueue; pub mod workqueue;

View file

@ -51,8 +51,8 @@ use util::opts;
use std::env; use std::env;
mod window;
mod input; mod input;
mod window;
struct BrowserWrapper { struct BrowserWrapper {
browser: Browser, browser: Browser,
@ -105,4 +105,3 @@ fn main() {
} = browser; } = browser;
browser.shutdown(); browser.shutdown();
} }