Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23726 - servo:rustup, r=emilio

Browse source 
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:
bors-servo 2019-07-17 08:56:27 -04:00 • committed by GitHub
commit 25d8a6999b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 80 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/webglshader.rs
View file

@ -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 {

6
components/script/lib.rs
View file

@ -106,14 +106,16 @@ use script_traits::SWManagerSenders;
#[cfg(target_os = "linux")]
#[allow(unsafe_code)]
fn perform_platform_specific_initialization() {
use std::mem;
// 4096 is default max on many linux systems
const MAX_FILE_LIMIT: libc::rlim_t = 4096;
// Bump up our number of file descriptors to save us from impending doom caused by an onslaught
// of iframes.
unsafe {
let mut rlim: libc::rlimit = mem::uninitialized();
let mut rlim = libc::rlimit {
rlim_cur: 0,
rlim_max: 0,
};
match libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) {
0 => {
if rlim.rlim_cur >= MAX_FILE_LIMIT {