aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglprogram.rs
diff options
context:
space:
mode:
authorBrandon Fairchild <csbit32@gmail.com>2015-09-17 17:55:01 -0400
committerBrandon Fairchild <csbit32@gmail.com>2015-09-19 12:50:14 -0400
commitde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/script/dom/webglprogram.rs
parente924393be8cce6cb16d3af5a13ed9f634670f843 (diff)
downloadservo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.tar.gz
servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.zip
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
Diffstat (limited to 'components/script/dom/webglprogram.rs')
-rw-r--r--components/script/dom/webglprogram.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index 2a1a0cfc6a5..231a16017c0 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -3,17 +3,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl
+use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLResult, WebGLError};
use dom::bindings::codegen::Bindings::WebGLProgramBinding;
+use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::utils::reflect_dom_object;
use dom::webglobject::WebGLObject;
use dom::webglrenderingcontext::MAX_UNIFORM_AND_ATTRIBUTE_LEN;
use dom::webglshader::WebGLShader;
-
-use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
-
-use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLResult, WebGLError};
use ipc_channel::ipc::{self, IpcSender};
use std::cell::Cell;