From 4cb68b230a370d4765db38cd612dca7d535c4fed Mon Sep 17 00:00:00 2001 From: Dimitris Iliopoulos Date: Wed, 9 Nov 2022 19:37:29 -0800 Subject: [PATCH] update to Rust 1.65.0 Summary: Added `fbcode` symlinks for `platform010` & `platform010-aarch64` and addressed the following fixes: * Account for stabilized [`#![feature(backtrace)]`](https://github.com/rust-lang/rust/pull/99573) and [`#![feature(generic_associated_types)]`](https://github.com/rust-lang/rust/pull/99573) * Account for removal of [`#![feature(result_into_ok_or_err)]`](https://github.com/rust-lang/rust/pull/100604) * Account for migration of [`std::io::ReadBuf` to `std::io::BorrowBuf|BorrowCursor`](https://github.com/rust-lang/rust/pull/97015) * Account for [`Error` trait move into core](https://github.com/rust-lang/rust/pull/99917) * Account for `#[warn(non_camel_case_types)]` * Various function signature, lifetime requirement changes and lint fixes Reviewed By: zertosh Differential Revision: D40923615 fbshipit-source-id: f7ac2828d74edeae39aae517172207b0ee998a59 --- eden/mononoke/land_service/src/main.rs | 2 -- .../megarepo_api/megarepo_config/src/lib.rs | 1 - .../megarepo_api/megarepo_error/src/lib.rs | 1 - eden/mononoke/mononoke_api/src/errors.rs | 18 ------------------ eden/mononoke/mononoke_api/src/lib.rs | 1 - eden/mononoke/reachabilityindex/src/lib.rs | 1 - eden/mononoke/scs_server/src/main.rs | 1 - 7 files changed, 25 deletions(-) diff --git a/eden/mononoke/land_service/src/main.rs b/eden/mononoke/land_service/src/main.rs index de06cb563f9c0..aa2e00873203e 100644 --- a/eden/mononoke/land_service/src/main.rs +++ b/eden/mononoke/land_service/src/main.rs @@ -5,8 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] - use std::fs::File; use std::io::Write; use std::sync::atomic::AtomicBool; diff --git a/eden/mononoke/megarepo_api/megarepo_config/src/lib.rs b/eden/mononoke/megarepo_api/megarepo_config/src/lib.rs index 1a9da6f6596cb..e2da2b1828227 100644 --- a/eden/mononoke/megarepo_api/megarepo_config/src/lib.rs +++ b/eden/mononoke/megarepo_api/megarepo_config/src/lib.rs @@ -5,7 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] #![cfg_attr(not(fbcode_build), allow(unused_crate_dependencies))] use std::path::Path; diff --git a/eden/mononoke/megarepo_api/megarepo_error/src/lib.rs b/eden/mononoke/megarepo_api/megarepo_error/src/lib.rs index 9941dd4276e19..3e894cc64ff3b 100644 --- a/eden/mononoke/megarepo_api/megarepo_error/src/lib.rs +++ b/eden/mononoke/megarepo_api/megarepo_error/src/lib.rs @@ -5,7 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] #![feature(error_generic_member_access)] #![feature(provide_any)] diff --git a/eden/mononoke/mononoke_api/src/errors.rs b/eden/mononoke/mononoke_api/src/errors.rs index 1c64c888911da..a3d01b9e9c91c 100644 --- a/eden/mononoke/mononoke_api/src/errors.rs +++ b/eden/mononoke/mononoke_api/src/errors.rs @@ -6,7 +6,6 @@ */ use std::any::Demand; -use std::any::Provider; use std::backtrace::Backtrace; use std::convert::Infallible; use std::error::Error as StdError; @@ -90,23 +89,6 @@ pub enum MononokeError { InternalError(#[source] InternalError), } -impl Provider for MononokeError { - fn provide<'a>(&'a self, demand: &mut Demand<'a>) { - match self { - Self::InvalidRequest(..) - | Self::MergeConflicts { .. } - | Self::PushrebaseConflicts(..) - | Self::ServicePermissionDenied { .. } - | Self::HookFailure(..) - | Self::NotAvailable(..) - | Self::AuthorizationError(..) => {} - Self::InternalError(error) => { - demand.provide_ref::(error.backtrace()); - } - } - } -} - impl From for MononokeError { fn from(e: Error) -> Self { MononokeError::InternalError(InternalError(Arc::new(e))) diff --git a/eden/mononoke/mononoke_api/src/lib.rs b/eden/mononoke/mononoke_api/src/lib.rs index 1bb9f428bba78..0ef2cc79faa1b 100644 --- a/eden/mononoke/mononoke_api/src/lib.rs +++ b/eden/mononoke/mononoke_api/src/lib.rs @@ -5,7 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] #![feature(error_generic_member_access)] #![feature(provide_any)] diff --git a/eden/mononoke/reachabilityindex/src/lib.rs b/eden/mononoke/reachabilityindex/src/lib.rs index ff02b7cda7310..e91e3a265ff43 100644 --- a/eden/mononoke/reachabilityindex/src/lib.rs +++ b/eden/mononoke/reachabilityindex/src/lib.rs @@ -5,7 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] #![feature(error_generic_member_access)] #![feature(provide_any)] diff --git a/eden/mononoke/scs_server/src/main.rs b/eden/mononoke/scs_server/src/main.rs index 6f2009dafe8d9..d77fd9a74c8e7 100644 --- a/eden/mononoke/scs_server/src/main.rs +++ b/eden/mononoke/scs_server/src/main.rs @@ -5,7 +5,6 @@ * GNU General Public License version 2. */ -#![feature(backtrace)] #![type_length_limit = "2097152"] use std::fs::File;