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

Upgrade the Rust toolchain to 'nightly-2023-02-01'

Browse source 
Signed-off-by: Mukilan Thiyagarajan <mukilanthiagarajan@gmail.com>
This commit is contained in:
Mukilan Thiyagarajan 2023-01-31 20:48:41 +05:30
parent 4aac7e4d3c
commit 5738a16dcb
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script_plugins/lib.rs
View file

@ -24,10 +24,11 @@ use rustc_ast::ast::{AttrKind, Attribute};
use rustc_driver::plugin::Registry; use rustc_driver::plugin::Registry;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::intravisit as visit; use rustc_hir::intravisit as visit;
use rustc_hir::{self as hir, ExprKind, HirId}; use rustc_hir::{self as hir, ExprKind};
use rustc_lint::{LateContext, LateLintPass, LintContext, LintPass}; use rustc_lint::{LateContext, LateLintPass, LintContext, LintPass};
use rustc_middle::ty; use rustc_middle::ty;
use rustc_session::declare_lint; use rustc_session::declare_lint;
use rustc_span::def_id::LocalDefId;
use rustc_span::source_map; use rustc_span::source_map;
use rustc_span::source_map::{ExpnKind, MacroKind, Span}; use rustc_span::source_map::{ExpnKind, MacroKind, Span};
use rustc_span::symbol::sym; use rustc_span::symbol::sym;
@ -215,8 +216,8 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
} }
if let hir::ItemKind::Struct(def, ..) = &item.kind { if let hir::ItemKind::Struct(def, ..) = &item.kind {
for ref field in def.fields() { for ref field in def.fields() {
let def_id = cx.tcx.hir().local_def_id(field.hir_id); let field_type = cx.tcx.type_of(field.def_id);
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) { if is_unrooted_ty(&self.symbols, cx, field_type, false) {
cx.lint( cx.lint(
UNROOTED_MUST_ROOT, UNROOTED_MUST_ROOT,
"Type must be rooted, use #[unrooted_must_root_lint::must_root] \ "Type must be rooted, use #[unrooted_must_root_lint::must_root] \
@ -238,8 +239,8 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
match var.data { match var.data {
hir::VariantData::Tuple(fields, ..) => { hir::VariantData::Tuple(fields, ..) => {
for field in fields { for field in fields {
let def_id = cx.tcx.hir().local_def_id(field.hir_id); let field_type = cx.tcx.type_of(field.def_id);
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) { if is_unrooted_ty(&self.symbols, cx, field_type, false) {
cx.lint( cx.lint(
UNROOTED_MUST_ROOT, UNROOTED_MUST_ROOT,
"Type must be rooted, \ "Type must be rooted, \
@ -262,7 +263,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
decl: &'tcx hir::FnDecl, decl: &'tcx hir::FnDecl,
body: &'tcx hir::Body, body: &'tcx hir::Body,
span: source_map::Span, span: source_map::Span,
id: HirId, def_id: LocalDefId,
) { ) {
let in_new_function = match kind { let in_new_function = match kind {
visit::FnKind::ItemFn(n, _, _) | visit::FnKind::Method(n, _) => { visit::FnKind::ItemFn(n, _, _) | visit::FnKind::Method(n, _) => {
@ -272,7 +273,6 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
}; };
if !in_derive_expn(span) { if !in_derive_expn(span) {
let def_id = cx.tcx.hir().local_def_id(id);
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx); let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) { for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2022-11-20 nightly-2023-02-01