Skip to content

Commit

Permalink
update to Rust 1.65.0
Browse files Browse the repository at this point in the history
Summary:
Added `fbcode` symlinks for `platform010` & `platform010-aarch64` and addressed the following fixes:
* Account for stabilized [`#![feature(backtrace)]`](rust-lang/rust#99573) and [`#![feature(generic_associated_types)]`](rust-lang/rust#99573)
* Account for removal of [`#![feature(result_into_ok_or_err)]`](rust-lang/rust#100604)
* Account for migration of [`std::io::ReadBuf` to `std::io::BorrowBuf|BorrowCursor`](rust-lang/rust#97015)
* Account for [`Error` trait move into core](rust-lang/rust#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
  • Loading branch information
diliop authored and facebook-github-bot committed Nov 10, 2022
1 parent d545ed8 commit 4cb68b2
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 25 deletions.
2 changes: 0 additions & 2 deletions eden/mononoke/land_service/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/megarepo_api/megarepo_config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/megarepo_api/megarepo_error/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* GNU General Public License version 2.
*/

#![feature(backtrace)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

Expand Down
18 changes: 0 additions & 18 deletions eden/mononoke/mononoke_api/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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::<Backtrace>(error.backtrace());
}
}
}
}

impl From<Error> for MononokeError {
fn from(e: Error) -> Self {
MononokeError::InternalError(InternalError(Arc::new(e)))
Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/mononoke_api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* GNU General Public License version 2.
*/

#![feature(backtrace)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/reachabilityindex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* GNU General Public License version 2.
*/

#![feature(backtrace)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/scs_server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* GNU General Public License version 2.
*/

#![feature(backtrace)]
#![type_length_limit = "2097152"]

use std::fs::File;
Expand Down

0 comments on commit 4cb68b2

Please sign in to comment.