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 c6532de commit 84da445
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion experimental/reverie-rpc-macros/src/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl Service {
where
S: #ident + Send,
{
type Request<'r> = #request_ident #request_lifetime;
type Request<'r> where S: 'r = #request_ident #request_lifetime;
type Response = #response_ident;
type Future<'a> where S: 'a = ::reverie_rpc::BoxFuture<'a, Option<Self::Response>>;

Expand Down
2 changes: 0 additions & 2 deletions experimental/reverie-rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
* LICENSE file in the root directory of this source tree.
*/

#![feature(generic_associated_types)]

//! This crate provides the protocol that is to be used when communicating with
//! global state. This crate is meant to be shared between the guest and host
//! processes.
Expand Down
10 changes: 5 additions & 5 deletions experimental/reverie-rpc/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ use serde::Serialize;
pub type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;

pub trait Service {
type Request<'r>: Deserialize<'r> + Unpin + Send;
type Request<'r>: Deserialize<'r> + Unpin + Send
where
Self: 'r;
type Response: Serialize + Send + Unpin;
type Future<'a>: Future<Output = Option<Self::Response>> + Send + 'a
where
Expand All @@ -31,12 +33,10 @@ impl<S> Service for Arc<S>
where
S: Service,
{
type Request<'r> = S::Request<'r>;
type Request<'r> = S::Request<'r> where S: 'r;
type Response = S::Response;
type Future<'a>
where
S: 'a,
= S::Future<'a>;
= S::Future<'a> where S: 'a;

fn call<'a>(&'a self, req: Self::Request<'a>) -> Self::Future<'a> {
self.as_ref().call(req)
Expand Down
3 changes: 0 additions & 3 deletions experimental/riptrace/rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
* LICENSE file in the root directory of this source tree.
*/

// reverie_rpc::service requires GATs.
#![feature(generic_associated_types)]

//! This contains the RPC protocol for the guest and host. That is, how the host
//! and guest should talk to each other.

Expand Down
3 changes: 0 additions & 3 deletions experimental/traceviz/rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
* LICENSE file in the root directory of this source tree.
*/

// reverie_rpc::service requires GATs.
#![feature(generic_associated_types)]

//! This contains the RPC protocol for the guest and host. That is, how the host
//! and guest should talk to each other.

Expand Down

0 comments on commit 84da445

Please sign in to comment.