Auto merge of #24557 - servo:rustup, r=jdm

Upgrade to rustc 1.40.0-nightly (246be7e1a 2019-10-25)

components/script/init.rs

@@ -0,0 +1,69 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::codegen::RegisterBindings;
+use crate::dom::bindings::proxyhandler;
+use crate::serviceworker_manager::ServiceWorkerManager;
+use script_traits::SWManagerSenders;
+
+#[cfg(target_os = "linux")]
+#[allow(unsafe_code)]
+fn perform_platform_specific_initialization() {
+    // 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 {
+            rlim_cur: 0,
+            rlim_max: 0,
+        };
+        match libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) {
+            0 => {
+                if rlim.rlim_cur >= MAX_FILE_LIMIT {
+                    // we have more than enough
+                    return;
+                }
+
+                rlim.rlim_cur = match rlim.rlim_max {
+                    libc::RLIM_INFINITY => MAX_FILE_LIMIT,
+                    _ => {
+                        if rlim.rlim_max < MAX_FILE_LIMIT {
+                            rlim.rlim_max
+                        } else {
+                            MAX_FILE_LIMIT
+                        }
+                    },
+                };
+                match libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) {
+                    0 => (),
+                    _ => warn!("Failed to set file count limit"),
+                };
+            },
+            _ => warn!("Failed to get file count limit"),
+        };
+    }
+}
+
+#[cfg(not(target_os = "linux"))]
+fn perform_platform_specific_initialization() {}
+
+pub fn init_service_workers(sw_senders: SWManagerSenders) {
+    // Spawn the service worker manager passing the constellation sender
+    ServiceWorkerManager::spawn_manager(sw_senders);
+}
+
+#[allow(unsafe_code)]
+pub fn init() {
+    unsafe {
+        proxyhandler::init();
+
+        // Create the global vtables used by the (generated) DOM
+        // bindings to implement JS proxies.
+        RegisterBindings::RegisterProxyHandlers();
+    }
+
+    perform_platform_specific_initialization();
+}

components/script/lib.rs

@@ -11,8 +11,9 @@
 #![deny(unsafe_code)]
 #![allow(non_snake_case)]
 #![doc = "The script crate contains all matters DOM."]
-#![plugin(script_plugins)]
 #![cfg_attr(not(feature = "unrooted_must_root_lint"), allow(unknown_lints))]
+#![allow(deprecated)] // FIXME: Can we make `allow` only apply to the `plugin` crate attribute?
+#![plugin(script_plugins)]
 
 #[macro_use]
 extern crate bitflags;
@@ -47,38 +48,70 @@ extern crate servo_atoms;
 #[macro_use]
 extern crate style;
 
+#[warn(deprecated)]
 #[macro_use]
 mod task;
+#[warn(deprecated)]
 mod body;
+#[warn(deprecated)]
 pub mod clipboard_provider;
+#[warn(deprecated)]
 mod devtools;
+#[warn(deprecated)]
 pub mod document_loader;
+#[warn(deprecated)]
 #[macro_use]
 mod dom;
+#[warn(deprecated)]
 mod canvas_state;
+#[warn(deprecated)]
 mod compartments;
+#[warn(deprecated)]
 pub mod fetch;
+#[warn(deprecated)]
 mod image_listener;
+#[warn(deprecated)]
+mod init;
+#[warn(deprecated)]
 mod layout_image;
+#[warn(deprecated)]
 mod mem;
+#[warn(deprecated)]
 mod microtask;
+#[warn(deprecated)]
 mod network_listener;
+#[warn(deprecated)]
 pub mod script_runtime;
+#[warn(deprecated)]
 #[allow(unsafe_code)]
 pub mod script_thread;
+#[warn(deprecated)]
 mod serviceworker_manager;
+#[warn(deprecated)]
 mod serviceworkerjob;
+#[warn(deprecated)]
 mod stylesheet_loader;
+#[warn(deprecated)]
 mod stylesheet_set;
+#[warn(deprecated)]
 mod task_manager;
+#[warn(deprecated)]
 mod task_queue;
+#[warn(deprecated)]
 mod task_source;
+#[warn(deprecated)]
 pub mod test;
+#[warn(deprecated)]
 pub mod textinput;
+#[warn(deprecated)]
 mod timers;
+#[warn(deprecated)]
 mod unpremultiplytable;
+#[warn(deprecated)]
 mod webdriver_handlers;
 
+pub use init::{init, init_service_workers};
+
 /// A module with everything layout can use from script.
 ///
 /// Try to keep this small!
@@ -98,69 +131,3 @@ pub mod layout_exports {
     pub use crate::dom::shadowroot::{LayoutShadowRootHelpers, ShadowRoot};
     pub use crate::dom::text::Text;
 }
-
-use crate::dom::bindings::codegen::RegisterBindings;
-use crate::dom::bindings::proxyhandler;
-use crate::serviceworker_manager::ServiceWorkerManager;
-use script_traits::SWManagerSenders;
-
-#[cfg(target_os = "linux")]
-#[allow(unsafe_code)]
-fn perform_platform_specific_initialization() {
-    // 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 {
-            rlim_cur: 0,
-            rlim_max: 0,
-        };
-        match libc::getrlimit(libc::RLIMIT_NOFILE, &mut rlim) {
-            0 => {
-                if rlim.rlim_cur >= MAX_FILE_LIMIT {
-                    // we have more than enough
-                    return;
-                }
-
-                rlim.rlim_cur = match rlim.rlim_max {
-                    libc::RLIM_INFINITY => MAX_FILE_LIMIT,
-                    _ => {
-                        if rlim.rlim_max < MAX_FILE_LIMIT {
-                            rlim.rlim_max
-                        } else {
-                            MAX_FILE_LIMIT
-                        }
-                    },
-                };
-                match libc::setrlimit(libc::RLIMIT_NOFILE, &rlim) {
-                    0 => (),
-                    _ => warn!("Failed to set file count limit"),
-                };
-            },
-            _ => warn!("Failed to get file count limit"),
-        };
-    }
-}
-
-#[cfg(not(target_os = "linux"))]
-fn perform_platform_specific_initialization() {}
-
-pub fn init_service_workers(sw_senders: SWManagerSenders) {
-    // Spawn the service worker manager passing the constellation sender
-    ServiceWorkerManager::spawn_manager(sw_senders);
-}
-
-#[allow(unsafe_code)]
-pub fn init() {
-    unsafe {
-        proxyhandler::init();
-
-        // Create the global vtables used by the (generated) DOM
-        // bindings to implement JS proxies.
-        RegisterBindings::RegisterProxyHandlers();
-    }
-
-    perform_platform_specific_initialization();
-}

components/script_plugins/lib.rs

@@ -27,7 +27,7 @@ extern crate syntax;
 use rustc::hir::def_id::DefId;
 use rustc::hir::intravisit as visit;
 use rustc::hir::{self, ExprKind, HirId};
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
+use rustc::lint::{LateContext, LateLintPass, LintContext, LintPass};
 use rustc::ty;
 use rustc_driver::plugin::Registry;
 use syntax::feature_gate::AttributeType::Whitelisted;
@@ -36,13 +36,20 @@ use syntax::source_map::{ExpnKind, MacroKind, Span};
 use syntax::symbol::sym;
 use syntax::symbol::Symbol;
 
+#[allow(deprecated)]
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
+    registrar(reg)
+}
+
+fn registrar(reg: &mut Registry) {
     let symbols = Symbols::new();
     reg.register_attribute(symbols.allow_unrooted_interior, Whitelisted);
     reg.register_attribute(symbols.allow_unrooted_in_rc, Whitelisted);
     reg.register_attribute(symbols.must_root, Whitelisted);
-    reg.register_late_lint_pass(Box::new(UnrootedPass::new(symbols)));
+    reg.lint_store.register_lints(&[&UNROOTED_MUST_ROOT]);
+    reg.lint_store
+        .register_late_pass(move || Box::new(UnrootedPass::new(symbols.clone())));
 }
 
 declare_lint!(
@@ -165,10 +172,6 @@ impl LintPass for UnrootedPass {
     fn name(&self) -> &'static str {
         "ServoUnrootedPass"
     }
-
-    fn get_lints(&self) -> LintArray {
-        lint_array!(UNROOTED_MUST_ROOT)
-    }
 }
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
@@ -360,7 +363,7 @@ fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool {
     other
         .into_iter()
         .zip(path)
-        .all(|(e, p)| e.data.as_interned_str().as_symbol() == *p)
+        .all(|(e, p)| e.data.as_symbol() == *p)
 }
 
 fn in_derive_expn(span: Span) -> bool {

etc/taskcluster/decision_task.py

@@ -157,6 +157,9 @@ def linux_tidy_unit_untrusted():
         .with_dockerfile(dockerfile_path("build"))
         .with_env(**build_env, **unix_build_env, **linux_build_env)
         .with_repo()
+        .with_script("rustup set profile minimal")
+        # required by components/script_plugins:
+        .with_script("rustup component add rustc-dev")
         .with_script("""
             ./mach test-tidy --no-progress --all
             ./mach test-tidy --no-progress --self-test
@@ -761,6 +764,9 @@ def linux_build_task(name, *, build_env=build_env):
         .with_dockerfile(dockerfile_path("build"))
         .with_env(**build_env, **unix_build_env, **linux_build_env)
         .with_repo()
+        .with_script("rustup set profile minimal")
+        # required by components/script_plugins:
+        .with_script("rustup component add rustc-dev")
     )
 
 
@@ -806,6 +812,9 @@ def windows_build_task(name, package=True, arch="x86_64"):
             path="python3",
         )
         .with_rustup()
+        .with_script("rustup set profile minimal")
+        # required by components/script_plugins:
+        .with_script("rustup component add rustc-dev")
     )
     if arch in hashes["non-devel"] and arch in hashes["devel"]:
         task = (
@@ -858,6 +867,11 @@ def macos_build_task(name):
         .with_repo()
         .with_python2()
         .with_rustup()
+        # Since macOS workers are long-lived and ~/.rustup kept across tasks:
+        .with_script("rustup self update")
+        .with_script("rustup set profile minimal")
+        # required by components/script_plugins:
+        .with_script("rustup component add rustc-dev")
         .with_index_and_artifacts_expire_in(build_artifacts_expire_in)
         # Debugging for surprising generic-worker behaviour
         .with_early_script("ls")

etc/taskcluster/decisionlib.py

@@ -657,8 +657,6 @@ class MacOsGenericWorkerTask(UnixTaskMixin, GenericWorkerTask):
         return self.with_early_script("""
             export PATH="$HOME/.cargo/bin:$PATH"
             which rustup || curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
-            rustup self update
-            rustup set profile minimal
         """)
 
 

rust-toolchain

@@ -1 +1 @@
-nightly-2019-09-28
+nightly-2019-10-26