Skip to content

Commit 84da445

Browse files
diliopfacebook-github-bot
authored andcommitted
update to Rust 1.65.0
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
1 parent c6532de commit 84da445

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

experimental/reverie-rpc-macros/src/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl Service {
136136
where
137137
S: #ident + Send,
138138
{
139-
type Request<'r> = #request_ident #request_lifetime;
139+
type Request<'r> where S: 'r = #request_ident #request_lifetime;
140140
type Response = #response_ident;
141141
type Future<'a> where S: 'a = ::reverie_rpc::BoxFuture<'a, Option<Self::Response>>;
142142

experimental/reverie-rpc/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#![feature(generic_associated_types)]
10-
119
//! This crate provides the protocol that is to be used when communicating with
1210
//! global state. This crate is meant to be shared between the guest and host
1311
//! processes.

experimental/reverie-rpc/src/service.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ use serde::Serialize;
1616
pub type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;
1717

1818
pub trait Service {
19-
type Request<'r>: Deserialize<'r> + Unpin + Send;
19+
type Request<'r>: Deserialize<'r> + Unpin + Send
20+
where
21+
Self: 'r;
2022
type Response: Serialize + Send + Unpin;
2123
type Future<'a>: Future<Output = Option<Self::Response>> + Send + 'a
2224
where
@@ -31,12 +33,10 @@ impl<S> Service for Arc<S>
3133
where
3234
S: Service,
3335
{
34-
type Request<'r> = S::Request<'r>;
36+
type Request<'r> = S::Request<'r> where S: 'r;
3537
type Response = S::Response;
3638
type Future<'a>
37-
where
38-
S: 'a,
39-
= S::Future<'a>;
39+
= S::Future<'a> where S: 'a;
4040

4141
fn call<'a>(&'a self, req: Self::Request<'a>) -> Self::Future<'a> {
4242
self.as_ref().call(req)

experimental/riptrace/rpc/src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
// reverie_rpc::service requires GATs.
10-
#![feature(generic_associated_types)]
11-
129
//! This contains the RPC protocol for the guest and host. That is, how the host
1310
//! and guest should talk to each other.
1411

experimental/traceviz/rpc/src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
// reverie_rpc::service requires GATs.
10-
#![feature(generic_associated_types)]
11-
129
//! This contains the RPC protocol for the guest and host. That is, how the host
1310
//! and guest should talk to each other.
1411

0 commit comments

Comments
 (0)