diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-06 13:38:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-06 13:38:52 -0500 |
commit | 6878dbbbeaa59b21a7b3608b6d6a911e88c1e443 (patch) | |
tree | f4a13f7d59c7f72c51e30755d1097595764f96c0 /components/script/dom/webglshader.rs | |
parent | 8df38f5e29d0005b792d403c3c54d35748448100 (diff) | |
parent | 8757cf5bc084ee23db643e283ca7e9fef143d810 (diff) | |
download | servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.tar.gz servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.zip |
Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin
Switch some crates to the 2018 edition
This is the subset of https://github.com/servo/servo/pull/22083 that doesn’t affect Gecko at all, so it isn’t blocked.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglshader.rs')
-rw-r--r-- | components/script/dom/webglshader.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs index 685ae99505a..9add3e686b5 100644 --- a/components/script/dom/webglshader.rs +++ b/components/script/dom/webglshader.rs @@ -6,17 +6,17 @@ use canvas_traits::webgl::{WebGLCommand, WebGLError}; use canvas_traits::webgl::{WebGLResult, WebGLSLVersion, WebGLShaderId}; use canvas_traits::webgl::{WebGLVersion, webgl_channel}; -use dom::bindings::cell::DomRefCell; -use dom::bindings::codegen::Bindings::WebGLShaderBinding; -use dom::bindings::inheritance::Castable; -use dom::bindings::reflector::{DomObject, reflect_dom_object}; -use dom::bindings::root::DomRoot; -use dom::bindings::str::DOMString; -use dom::webgl_extensions::WebGLExtensions; -use dom::webgl_extensions::ext::extshadertexturelod::EXTShaderTextureLod; -use dom::webgl_extensions::ext::oesstandardderivatives::OESStandardDerivatives; -use dom::webglobject::WebGLObject; -use dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::codegen::Bindings::WebGLShaderBinding; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::reflector::{DomObject, reflect_dom_object}; +use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::str::DOMString; +use crate::dom::webgl_extensions::WebGLExtensions; +use crate::dom::webgl_extensions::ext::extshadertexturelod::EXTShaderTextureLod; +use crate::dom::webgl_extensions::ext::oesstandardderivatives::OESStandardDerivatives; +use crate::dom::webglobject::WebGLObject; +use crate::dom::webglrenderingcontext::WebGLRenderingContext; use dom_struct::dom_struct; use mozangle::shaders::{BuiltInResources, Output, ShaderValidator}; use offscreen_gl_context::GLLimits; |