Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rustc.

Browse source
This commit is contained in:
Josh Matthews 2021-12-02 17:05:19 -05:00
parent e46d952efd
commit 898f66bcd0
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ impl IdentityHub {
#[derive(Debug)] #[derive(Debug)]
pub struct Identities { pub struct Identities {
surface: IdentityManager, _surface: IdentityManager,
#[cfg(any(target_os = "linux", target_os = "windows"))] #[cfg(any(target_os = "linux", target_os = "windows"))]
vk_hub: IdentityHub, vk_hub: IdentityHub,
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
@ -69,7 +69,7 @@ pub struct Identities {
impl Identities { impl Identities {
pub fn new() -> Self { pub fn new() -> Self {
Identities { Identities {
surface: IdentityManager::default(), _surface: IdentityManager::default(),
#[cfg(any(target_os = "linux", target_os = "windows"))] #[cfg(any(target_os = "linux", target_os = "windows"))]
vk_hub: IdentityHub::new(), vk_hub: IdentityHub::new(),
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]

2
components/script_plugins/lib.rs
View file

@ -233,7 +233,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
/// must be #[unrooted_must_root_lint::must_root] themselves /// must be #[unrooted_must_root_lint::must_root] themselves
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant) { fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant) {
let ref map = cx.tcx.hir(); 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()); let attrs = cx.tcx.hir().attrs(parent_item.hir_id());
if !has_lint_attr(&self.symbols, &attrs, self.symbols.must_root) { if !has_lint_attr(&self.symbols, &attrs, self.symbols.must_root) {
match var.data { match var.data {

2
ports/winit/app.rs
View file

@ -15,7 +15,7 @@ use servo::compositing::windowing::WindowEvent;
use servo::config::opts::{self, parse_url_or_filename}; use servo::config::opts::{self, parse_url_or_filename};
use servo::servo_config::pref; use servo::servo_config::pref;
use servo::servo_url::ServoUrl; use servo::servo_url::ServoUrl;
use servo::{BrowserId, Servo}; use servo::Servo;
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use std::collections::HashMap; use std::collections::HashMap;
use std::env; use std::env;

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2021-11-16 nightly-2021-12-02