Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit 63bb3eb

Browse files
David Tolnayfacebook-github-bot
authored andcommitted
Back out rust 1.61.0 upgrade from fbcode and xplat
Summary: This reverts the following stack of 4 diffs: - {D36877131} - {D36887647} - {D36888466} - {D36930916 (c4f0de9)} until someone on the Rust team has a chance to investigate an extreme regression in compile time/memory, and we have either a workaround or a backported fix. Reviewed By: zertosh, diliop Differential Revision: D37023453 fbshipit-source-id: f7667041738fc3f0542e571fab578c422164de4c
1 parent c4f0de9 commit 63bb3eb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

gazebo_lint/src/clippy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ pub fn match_def_path(cx: &LateContext, did: DefId, syms: &[&str]) -> bool {
190190
/// Matches the given `ty` with generics to the given types and generic types
191191
pub fn match_ty_path(cx: &LateContext, ty: Ty, ty_path: &[&str], generic_tys: &[&[&str]]) -> bool {
192192
if let TyKind::Adt(ty, subst) = ty.kind() {
193-
if match_def_path(cx, ty.did(), ty_path) {
193+
if match_def_path(cx, ty.did, ty_path) {
194194
let mut i = 0;
195195
while i < generic_tys.len() {
196196
if let Some(ty_param) = subst.type_at(i).ty_adt_def() {
197-
if !match_def_path(cx, ty_param.did(), generic_tys[i]) {
197+
if !match_def_path(cx, ty_param.did, generic_tys[i]) {
198198
return false;
199199
} else {
200200
i += 1;

gazebo_lint/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ fn check_impl_dupe(cx: &LateContext, item: &Item) {
428428
) -> bool {
429429
match self_tys.kind() {
430430
TyKind::Adt(self_adt, sub) => {
431-
for variant in self_adt.variants() {
431+
for variant in self_adt.variants.iter() {
432432
let mut fields = variant.fields.iter();
433433
if let Some(field) = fields.next() {
434434
if fields.next().is_some() {

0 commit comments

Comments
 (0)