mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #23726 - servo:rustup, r=emilio
Upgrade to rustc 1.38.0-nightly (4b65a86eb 2019-07-15) <del>This uses `MaybeUninit` in Stylo. `MaybeUninit` is stable in Rust 1.36.0, which Firefox [plans](https://wiki.mozilla.org/Rust_Update_Policy_for_Firefox) to require on 2019-06-18.</del> Update: `MaybeUninit` in Stylo removed from this PR, after https://github.com/rust-lang/rust/pull/62599. <!-- 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/23726) <!-- Reviewable:end -->
This commit is contained in:
commit
25d8a6999b
11 changed files with 80 additions and 82 deletions
|
@ -21,7 +21,7 @@ use dom_struct::dom_struct;
|
|||
use mozangle::shaders::{BuiltInResources, Output, ShaderValidator};
|
||||
use std::cell::Cell;
|
||||
use std::os::raw::c_int;
|
||||
use std::sync::{Once, ONCE_INIT};
|
||||
use std::sync::Once;
|
||||
|
||||
#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)]
|
||||
pub enum ShaderCompilationStatus {
|
||||
|
@ -42,7 +42,7 @@ pub struct WebGLShader {
|
|||
compilation_status: Cell<ShaderCompilationStatus>,
|
||||
}
|
||||
|
||||
static GLSLANG_INITIALIZATION: Once = ONCE_INIT;
|
||||
static GLSLANG_INITIALIZATION: Once = Once::new();
|
||||
|
||||
impl WebGLShader {
|
||||
fn new_inherited(context: &WebGLRenderingContext, id: WebGLShaderId, shader_type: u32) -> Self {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue