aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webgl_extensions
diff options
context:
space:
mode:
authorClément DAVID <c.david86@gmail.com>2017-08-23 14:10:08 +0200
committerClément DAVID <c.david86@gmail.com>2017-08-23 21:38:44 +0200
commitc5fe2351124c673d1dc4d59355a03654b4fcc541 (patch)
treebaa752c3c7847e85c0e50389400b45f7bf2fc390 /components/script/dom/webgl_extensions
parentab73f3d61d895289898821272f6af2665c9c645c (diff)
downloadservo-c5fe2351124c673d1dc4d59355a03654b4fcc541.tar.gz
servo-c5fe2351124c673d1dc4d59355a03654b4fcc541.zip
order derivable traits lists
Ignoring : - **generated**.rs - python/tidy/servo_tidy_tests/rust_tidy.rs
Diffstat (limited to 'components/script/dom/webgl_extensions')
-rw-r--r--components/script/dom/webgl_extensions/extensions.rs6
-rw-r--r--components/script/dom/webgl_extensions/wrapper.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs
index 3b702bec37a..8cda0a51980 100644
--- a/components/script/dom/webgl_extensions/extensions.rs
+++ b/components/script/dom/webgl_extensions/extensions.rs
@@ -44,7 +44,7 @@ const DEFAULT_DISABLED_GET_PARAMETER_NAMES: [GLenum; 1] = [
];
/// WebGL features that are enabled/disabled by WebGL Extensions.
-#[derive(JSTraceable, HeapSizeOf)]
+#[derive(HeapSizeOf, JSTraceable)]
struct WebGLExtensionFeatures {
gl_extensions: HashSet<String>,
disabled_tex_types: HashSet<GLenum>,
@@ -73,7 +73,7 @@ impl Default for WebGLExtensionFeatures {
/// Handles the list of implemented, supported and enabled WebGL extensions.
#[must_root]
-#[derive(JSTraceable, HeapSizeOf)]
+#[derive(HeapSizeOf, JSTraceable)]
pub struct WebGLExtensions {
extensions: DOMRefCell<HashMap<String, Box<WebGLExtensionWrapper>>>,
features: DOMRefCell<WebGLExtensionFeatures>,
@@ -223,7 +223,7 @@ impl WebGLExtensions {
}
// Helper structs
-#[derive(JSTraceable, HeapSizeOf, PartialEq, Eq, Hash)]
+#[derive(Eq, Hash, HeapSizeOf, JSTraceable, PartialEq)]
struct TexFormatType(u32, u32);
type WebGLQueryParameterFunc = Fn(*mut JSContext, &WebGLRenderingContext)
diff --git a/components/script/dom/webgl_extensions/wrapper.rs b/components/script/dom/webgl_extensions/wrapper.rs
index 684daef7556..3d3f8128e33 100644
--- a/components/script/dom/webgl_extensions/wrapper.rs
+++ b/components/script/dom/webgl_extensions/wrapper.rs
@@ -27,7 +27,7 @@ pub trait WebGLExtensionWrapper: JSTraceable + HeapSizeOf {
}
#[must_root]
-#[derive(JSTraceable, HeapSizeOf)]
+#[derive(HeapSizeOf, JSTraceable)]
pub struct TypedWebGLExtensionWrapper<T: WebGLExtension> {
extension: MutNullableJS<T::Extension>
}