From c5fe2351124c673d1dc4d59355a03654b4fcc541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= Date: Wed, 23 Aug 2017 14:10:08 +0200 Subject: order derivable traits lists Ignoring : - **generated**.rs - python/tidy/servo_tidy_tests/rust_tidy.rs --- components/script/dom/webgl_extensions/extensions.rs | 6 +++--- components/script/dom/webgl_extensions/wrapper.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'components/script/dom/webgl_extensions') 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, disabled_tex_types: HashSet, @@ -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>>, features: DOMRefCell, @@ -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 { extension: MutNullableJS } -- cgit v1.2.3