diff --git a/components/script/dom/identityhub.rs b/components/script/dom/identityhub.rs index 515e9f7e1b1..c4d997bcd6d 100644 --- a/components/script/dom/identityhub.rs +++ b/components/script/dom/identityhub.rs @@ -54,7 +54,7 @@ impl IdentityHub { #[derive(Debug)] pub struct Identities { - surface: IdentityManager, + _surface: IdentityManager, #[cfg(any(target_os = "linux", target_os = "windows"))] vk_hub: IdentityHub, #[cfg(target_os = "windows")] @@ -69,7 +69,7 @@ pub struct Identities { impl Identities { pub fn new() -> Self { Identities { - surface: IdentityManager::default(), + _surface: IdentityManager::default(), #[cfg(any(target_os = "linux", target_os = "windows"))] vk_hub: IdentityHub::new(), #[cfg(target_os = "windows")] diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index ed4afc96f8f..11d3b70609d 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -233,7 +233,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass { /// must be #[unrooted_must_root_lint::must_root] themselves fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant) { let ref map = cx.tcx.hir(); - let parent_item = map.expect_item(map.get_parent_item(var.id)); + let parent_item = map.expect_item(map.get_parent_item(var.id).expect_owner()); let attrs = cx.tcx.hir().attrs(parent_item.hir_id()); if !has_lint_attr(&self.symbols, &attrs, self.symbols.must_root) { match var.data { diff --git a/ports/winit/app.rs b/ports/winit/app.rs index 89078b2acce..582ddb94783 100644 --- a/ports/winit/app.rs +++ b/ports/winit/app.rs @@ -15,7 +15,7 @@ use servo::compositing::windowing::WindowEvent; use servo::config::opts::{self, parse_url_or_filename}; use servo::servo_config::pref; use servo::servo_url::ServoUrl; -use servo::{BrowserId, Servo}; +use servo::Servo; use std::cell::{Cell, RefCell}; use std::collections::HashMap; use std::env; diff --git a/rust-toolchain b/rust-toolchain index 8d7bb1b087a..9999297eff6 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-11-16 +nightly-2021-12-02