From 9bcdeb7e578990f78646503c5a9276898039c608 Mon Sep 17 00:00:00 2001 From: Dimitris Iliopoulos Date: Tue, 20 Feb 2024 10:31:00 -0800 Subject: [PATCH] Update platform010 & platform010-aarch64 symlinks Summary: `1.76.0` release with fixes addressing the following: * Release notes ([link](https://releases.rs/docs/1.76.0/)) * Most notable is [#118054](https://github.com/rust-lang/rust/pull/118054/) manifesting as: ``` error: unused implementer of `futures::Future` that must be used --> fbcode/mlx/metalearner/housekeeper/housekeeper.rs:213:13 | 213 | self.ping_oncall(&oncall, usecases); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: futures do nothing unless you `.await` or poll them = note: requested on the command line with `-D unused-must-use` ``` * Changes in `search_index.js` spec for `rustdoc` ([link](https://github.com/rust-lang/rust/pull/118910/files#diff-3ac57789ddcd2856a3b4f0c444f2813315179bdbe55bb945fe64fcb27b53fee5L491)) * Split of `#![feature(exposed_provenance)]` ([link](https://github.com/rust-lang/rust/pull/118487)) from [#95228](https://github.com/rust-lang/rust/issues/95228) * `buck2` OSS toolchain bump to `nightly-2023-12-11` just before [#11878](https://github.com/rust-lang/rust-clippy/pull/11878) and a bunch of other clippy lint renames. Reviewed By: dtolnay Differential Revision: D53776867 fbshipit-source-id: 78db83d8cdd6b0abae2b94ed1075e67b501fcd73 --- HACKING.md | 4 ++-- app/buck2_audit_server/src/cell.rs | 2 +- app/buck2_build_api/src/deferred/calculation.rs | 2 +- app/buck2_critical_path/src/graph.rs | 2 +- app/buck2_critical_path/src/types.rs | 6 +++--- app/buck2_error/src/lib.rs | 2 +- docs/getting_started.md | 4 ++-- rust-toolchain | 4 ++-- starlark-rust/starlark/src/lib.rs | 1 + starlark-rust/starlark_map/src/lib.rs | 1 + 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/HACKING.md b/HACKING.md index fb16ccbe2a48..86443868d29e 100644 --- a/HACKING.md +++ b/HACKING.md @@ -22,8 +22,8 @@ cargo install --path=app/buck2 Or, alternatively, install it directly from GitHub: ```sh -rustup install nightly-2023-11-10 -cargo +nightly-2023-11-10 install --git https://github.com/facebook/buck2.git buck2 +rustup install nightly-2023-12-11 +cargo +nightly-2023-12-11 install --git https://github.com/facebook/buck2.git buck2 ``` ### Side note: using [Nix] to compile the source diff --git a/app/buck2_audit_server/src/cell.rs b/app/buck2_audit_server/src/cell.rs index d17a36038b55..e9ba9df0d6e3 100644 --- a/app/buck2_audit_server/src/cell.rs +++ b/app/buck2_audit_server/src/cell.rs @@ -66,7 +66,7 @@ impl AuditSubcommand for AuditCellCommand { } pub(crate) fn audit_cell( - aliases_to_resolve: &Vec, + aliases_to_resolve: &[String], aliases: bool, cells: &CellResolver, cwd: &ProjectRelativePath, diff --git a/app/buck2_build_api/src/deferred/calculation.rs b/app/buck2_build_api/src/deferred/calculation.rs index 14044a6c507b..c94801447fd1 100644 --- a/app/buck2_build_api/src/deferred/calculation.rs +++ b/app/buck2_build_api/src/deferred/calculation.rs @@ -313,7 +313,7 @@ async fn compute_deferred( impl DeferredCompute { fn create_materializer_futs<'a>( &'a self, - materialized_artifacts: &'a Vec, + materialized_artifacts: &'a [ArtifactGroup], ctx: &'a DiceComputations, span: &'a Lazy, impl FnOnce() -> Option>, ) -> impl Future>> + 'a diff --git a/app/buck2_critical_path/src/graph.rs b/app/buck2_critical_path/src/graph.rs index ca1c5439a1c6..71eaa675a055 100644 --- a/app/buck2_critical_path/src/graph.rs +++ b/app/buck2_critical_path/src/graph.rs @@ -25,7 +25,7 @@ pub struct Graph { impl Graph { #[inline] - pub fn iter_vertices(&self) -> impl Iterator + DoubleEndedIterator { + pub fn iter_vertices(&self) -> impl DoubleEndedIterator { self.vertices.keys() } diff --git a/app/buck2_critical_path/src/types.rs b/app/buck2_critical_path/src/types.rs index c28bf907e893..0efea010b287 100644 --- a/app/buck2_critical_path/src/types.rs +++ b/app/buck2_critical_path/src/types.rs @@ -135,13 +135,13 @@ where Self(v, PhantomData) } - pub fn keys(&self) -> impl Iterator> + DoubleEndedIterator { + pub fn keys(&self) -> impl DoubleEndedIterator> { // By construction the length of this is always less than the maximum vertex id. let len: u32 = self.0.len().try_into().unwrap(); (0..len).map(AbstractVertexId::new) } - pub fn iter(&self) -> impl Iterator, &T)> + DoubleEndedIterator { + pub fn iter(&self) -> impl DoubleEndedIterator, &T)> { self.keys().map(|k| (k, &self.0[k.0 as usize])) } @@ -208,7 +208,7 @@ where Self(v) } - pub fn iter(&self) -> impl Iterator, &K)> + DoubleEndedIterator { + pub fn iter(&self) -> impl DoubleEndedIterator, &K)> { self.0.iter().map(|(key, idx)| (*idx, key)) } diff --git a/app/buck2_error/src/lib.rs b/app/buck2_error/src/lib.rs index 397901e23098..75c3cfa82db4 100644 --- a/app/buck2_error/src/lib.rs +++ b/app/buck2_error/src/lib.rs @@ -10,7 +10,7 @@ #![feature(error_generic_member_access)] #![feature(let_chains)] #![feature(trait_alias)] -#![feature(trait_upcasting)] +#![cfg_attr(fbcode_build, feature(trait_upcasting))] mod any; pub mod classify; diff --git a/docs/getting_started.md b/docs/getting_started.md index ea737fbfe4a1..59a5ef2a3ea3 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -18,8 +18,8 @@ To get started, first install [rustup](https://rustup.rs/), then compile the `buck2` executable: ```bash -rustup install nightly-2023-11-10 -cargo +nightly-2023-11-10 install --git https://github.com/facebook/buck2.git buck2 +rustup install nightly-2023-12-11 +cargo +nightly-2023-12-11 install --git https://github.com/facebook/buck2.git buck2 ``` The above commands install `buck2` into a suitable directory, such as diff --git a/rust-toolchain b/rust-toolchain index a69e38c28838..c9b564ca9932 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -9,6 +9,6 @@ # * NOTE: You may have to change this file in a follow up commit as ocamlrep # has a dependency on buck2 git trunk. -# @rustc_version: rustc 1.75.0-nightly (0f44eb32f 2023-11-09) -channel = "nightly-2023-11-10" +# @rustc_version: rustc 1.76.0-nightly (d86d65bbc 2023-12-10) +channel = "nightly-2023-12-11" components = ["llvm-tools-preview","rustc-dev","rust-src"] diff --git a/starlark-rust/starlark/src/lib.rs b/starlark-rust/starlark/src/lib.rs index 06da0d43a969..3e1a8e4ac90b 100644 --- a/starlark-rust/starlark/src/lib.rs +++ b/starlark-rust/starlark/src/lib.rs @@ -393,6 +393,7 @@ // Features we use #![allow(stable_features)] #![allow(unknown_lints)] // for clippy::tuple_array_conversions +#![cfg_attr(rust_nightly, allow(internal_features))] #![cfg_attr(rust_nightly, feature(const_type_id))] #![cfg_attr(rust_nightly, feature(core_intrinsics))] #![cfg_attr(rust_nightly, feature(cfg_sanitize))] diff --git a/starlark-rust/starlark_map/src/lib.rs b/starlark-rust/starlark_map/src/lib.rs index abf6a3933b48..f4df252eed3d 100644 --- a/starlark-rust/starlark_map/src/lib.rs +++ b/starlark-rust/starlark_map/src/lib.rs @@ -25,6 +25,7 @@ #![cfg_attr(rust_nightly, feature(core_intrinsics))] #![cfg_attr(rust_nightly, feature(portable_simd))] #![cfg_attr(rust_nightly, feature(cfg_version))] +#![cfg_attr(rust_nightly, allow(internal_features))] mod hash_value; mod hashed;