Update platform010 & platform010-aarch64 symlinks

diliop · facebook-github-bot · commit 6c7d8d94336e · 2025-05-27T20:58:42.000-07:00
Summary: Release notes: https://blog.rust-lang.org/2025/05/15/Rust-1.87.0/ Relevant changes: * `feature(extract_if)` stabilized * `feature(ptr_sub_ptr)` stabilized * `feature(os_str_display)` stabilized * `feature(slice_take)` stabilized * `feature(hash_raw_entry)` removed * `sub_ptr` renamed to `offset_from_unsigned` ([#137483](rust-lang/rust#137483)) * `MaybeUninit::uninit_array()` uses replaced with inline const blocks ([#125082](rust-lang/rust#125082)) * Lint `#[must_use`] attributes applied to methods in trait impls ([#136923](rust-lang/rust#136923)) * `clippy` lints: `io_other_error`, `elidable_lifetime_names`, `mem_replace_option_with_some`, `manual_contains`, `owned_cow` Reviewed By: dtolnay Differential Revision: D75010345 fbshipit-source-id: ab6ee65fe82eb7fe90b5aa9bbeeedefed2befad1
diff --git a/Cargo.toml b/Cargo.toml
@@ -252,7 +252,7 @@ rand_distr = "0.4"
 ref-cast = "1.0.0"
 regex = "1.5.4"
 relative-path = { version = "1.7.0", features = ["serde"] }
-rusqlite = { version = "0.32.1", features = ["bundled"] }
+rusqlite = { version = "0.33.0", features = ["bundled"] }
 rustc-hash = { version = "2.1" }
 rustls = "0.21.5"
 rustls-native-certs = { package = "rustls-native-certs", version = "0.6.2" }
diff --git 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-2025-02-16
-cargo +nightly-2025-02-16 install --git https://github.com/facebook/buck2.git buck2
+rustup install nightly-2025-03-29
+cargo +nightly-2025-03-29 install --git https://github.com/facebook/buck2.git buck2
 ```
 
 ### Side note: using [Nix] to compile the source
diff --git a/allocative/allocative/src/flamegraph.rs b/allocative/allocative/src/flamegraph.rs
@@ -451,7 +451,6 @@ impl VisitorImpl for FlameGraphBuilder {
         self.current().current_data().unique = true;
     }
 
-    #[must_use]
     fn enter_shared_impl(
         &mut self,
         name: Key,
diff --git a/app/buck2_action_impl/src/actions/impls/run.rs b/app/buck2_action_impl/src/actions/impls/run.rs
@@ -305,6 +305,7 @@ pub(crate) struct RunAction {
     input_files_bytes: u64,
 }
 
+#[allow(clippy::large_enum_variant)]
 enum ExecuteResult {
     LocalDepFileHit(ActionOutputs, ActionExecutionMetadata),
     ExecutedOrReHit {
diff --git a/app/buck2_build_api/src/build/build_report.rs b/app/buck2_build_api/src/build/build_report.rs
@@ -645,7 +645,7 @@ impl<'a> BuildReportCollector<'a> {
                 self.strings
                     .get(&out.last().unwrap().message_content)
                     .unwrap()
-                    .to_string(),
+                    .to_owned(),
             );
         }
 
diff --git a/app/buck2_build_api/src/interpreter/rule_defs/transitive_set/transitive_set_definition.rs b/app/buck2_build_api/src/interpreter/rule_defs/transitive_set/transitive_set_definition.rs
@@ -146,7 +146,7 @@ impl<V: ValueLifetimeless> TransitiveSetOperationsGen<V> {
             .iter()
             .filter_map(|(k, spec)| {
                 if kind == spec.kind {
-                    Some(k.to_string())
+                    Some(k.to_owned())
                 } else {
                     None
                 }
diff --git a/app/buck2_client_ctx/src/daemon/client/connect.rs b/app/buck2_client_ctx/src/daemon/client/connect.rs
@@ -869,6 +869,7 @@ async fn start_new_buckd_and_connect(
     Ok(client)
 }
 
+#[allow(clippy::large_enum_variant)]
 enum ConnectBeforeRestart {
     Accepted(BootstrapBuckdClient),
     Rejected,
diff --git a/app/buck2_client_ctx/src/lib.rs b/app/buck2_client_ctx/src/lib.rs
@@ -15,7 +15,6 @@
 #![feature(try_trait_v2)]
 #![feature(used_with_arg)]
 #![feature(round_char_boundary)]
-#![feature(extract_if)]
 
 pub mod argfiles;
 pub mod client_cpu_tracker;
diff --git a/app/buck2_client_ctx/src/subscribers/superconsole.rs b/app/buck2_client_ctx/src/subscribers/superconsole.rs
@@ -89,6 +89,7 @@ pub const CUTOFFS: Cutoffs = Cutoffs {
     _notable: Duration::from_millis(200),
 };
 
+#[allow(clippy::large_enum_variant)]
 pub enum StatefulSuperConsole {
     Running(StatefulSuperConsoleImpl),
     /// After receiving the command output, any stdout, or an event stream error, the superconsole
diff --git a/app/buck2_cmd_completion_client/src/complete.rs b/app/buck2_cmd_completion_client/src/complete.rs
@@ -108,7 +108,7 @@ impl CompleteCommand {
         matches: BuckArgMatches<'_>,
         ctx: ClientCommandContext<'_>,
     ) -> ExitResult {
-        let exit_result = match self.partial_target.split(':').collect::<Vec<_>>()[..] {
+        match self.partial_target.split(':').collect::<Vec<_>>()[..] {
             // Package completion is performed locally and called here directly
             [given_partial_package] => {
                 let roots = &ctx.paths()?.roots;
@@ -130,8 +130,7 @@ impl CompleteCommand {
                 "Malformed target string (expected [[cell]//][path/to/package][:target_name])",
             )
             .into(),
-        };
-        exit_result
+        }
     }
 }
 
diff --git a/app/buck2_cmd_completion_client/src/lib.rs b/app/buck2_cmd_completion_client/src/lib.rs
@@ -7,6 +7,7 @@
  * of this source tree.
  */
 
+#![allow(clippy::result_large_err)]
 #![feature(used_with_arg)]
 
 pub mod complete;
diff --git a/app/buck2_common/src/legacy_configs/parser.rs b/app/buck2_common/src/legacy_configs/parser.rs
@@ -203,8 +203,8 @@ impl LegacyConfigParser {
             .iter()
             .map(|(k, v)| {
                 v.values.iter().map(|(key, value)| buck2_data::ConfigValue {
-                    section: k.to_string(),
-                    key: key.to_string(),
+                    section: k.to_owned(),
+                    key: key.to_owned(),
                     value: value.raw_value().to_owned(),
                     cell: None,
                     is_cli,
diff --git a/app/buck2_error_derive/src/attr.rs b/app/buck2_error_derive/src/attr.rs
@@ -38,6 +38,7 @@ use syn::spanned::Spanned;
 use syn::token;
 
 /// Did the user provide an explicit value for the option, or a function from which to compute it
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
 pub enum OptionStyle {
     Explicit(syn::Ident),
diff --git a/app/buck2_event_observer/src/two_snapshots.rs b/app/buck2_event_observer/src/two_snapshots.rs
@@ -7,7 +7,6 @@
  * of this source tree.
  */
 
-use std::mem;
 use std::time::Duration;
 use std::time::SystemTime;
 
@@ -19,7 +18,7 @@ pub struct TwoSnapshots {
 
 impl TwoSnapshots {
     pub fn update(&mut self, timestamp: SystemTime, snapshot: &buck2_data::Snapshot) {
-        self.penultimate = mem::replace(&mut self.last, Some((timestamp, snapshot.clone())));
+        self.penultimate = self.last.replace((timestamp, snapshot.clone()));
     }
 
     fn non_zero_duration(&self) -> Option<Duration> {
diff --git a/app/buck2_forkserver/src/win/child_process.rs b/app/buck2_forkserver/src/win/child_process.rs
@@ -56,7 +56,7 @@ impl Future for ChildProcess {
             if let Some(ref mut w) = inner.waiting {
                 match Pin::new(&mut w.rx).poll(cx) {
                     Poll::Ready(Ok(())) => {}
-                    Poll::Ready(Err(e)) => Err(io::Error::new(io::ErrorKind::Other, e))?,
+                    Poll::Ready(Err(e)) => Err(io::Error::other(e))?,
                     Poll::Pending => return Poll::Pending,
                 }
                 let status = inner.inner.try_wait()?.ok_or(io::Error::new(
diff --git a/app/buck2_http/src/client.rs b/app/buck2_http/src/client.rs
@@ -219,10 +219,7 @@ where
 async fn read_truncated_error_response(
     mut resp: Response<BoxStream<'_, hyper::Result<Bytes>>>,
 ) -> String {
-    let read = StreamReader::new(
-        resp.body_mut()
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e)),
-    );
+    let read = StreamReader::new(resp.body_mut().map_err(std::io::Error::other));
     let mut buf = Vec::with_capacity(1024);
     read.take(1024).read_to_end(&mut buf).await.map_or_else(
         |e| format!("Error decoding response: {:?}", e),
@@ -234,8 +231,7 @@ async fn read_truncated_error_response(
 /// Warning: This does no length checking (like hyper::body::to_bytes). Should
 /// only be used for trusted endpoints.
 pub async fn to_bytes(body: BoxStream<'_, hyper::Result<Bytes>>) -> anyhow::Result<Bytes> {
-    let mut reader =
-        StreamReader::new(body.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e)));
+    let mut reader = StreamReader::new(body.map_err(std::io::Error::other));
     let mut buf = Vec::new();
     reader
         .read_to_end(&mut buf)
diff --git a/app/buck2_http/src/proxy.rs b/app/buck2_http/src/proxy.rs
@@ -178,9 +178,7 @@ impl NoProxy {
     fn should_bypass_proxy_for_host<S: AsRef<str>>(&self, host: S) -> bool {
         let host = host.as_ref();
         if let Ok(host_address) = host.parse::<IpAddr>() {
-            self.addresses
-                .iter()
-                .any(|address| host_address == *address)
+            self.addresses.contains(&host_address)
                 || self
                     .networks
                     .iter()
diff --git a/app/buck2_interpreter_for_build/src/interpreter/build_context.rs b/app/buck2_interpreter_for_build/src/interpreter/build_context.rs
@@ -55,6 +55,7 @@ enum BuildContextError {
     BasePathOnlyDefinedForPackageOrBuildFile(StarlarkFileType),
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum PerFileTypeContext {
     /// Context for evaluating `BUCK` files.
diff --git a/app/buck2_query/src/query/graph/async_bfs.rs b/app/buck2_query/src/query/graph/async_bfs.rs
@@ -8,7 +8,6 @@
  */
 
 use std::future;
-use std::mem;
 
 use buck2_error::BuckErrorContext;
 use buck2_error::internal_error;
@@ -142,14 +141,12 @@ pub(crate) async fn async_bfs_find_path<'a, N: LabeledNode + 'static>(
                     path.reverse();
                     return Ok(Some(path));
                 }
-                let prev = mem::replace(
-                    &mut visited
-                        .visited
-                        .get_mut(&key)
-                        .with_internal_error(|| format!("missing node {}", key))?
-                        .node,
-                    Some(node),
-                );
+                let prev = visited
+                    .visited
+                    .get_mut(&key)
+                    .with_internal_error(|| format!("missing node {}", key))?
+                    .node
+                    .replace(node);
                 if prev.is_some() {
                     return Err(internal_error!("duplicate node {}", key));
                 }
diff --git a/app/buck2_query/src/query/graph/vec_as_map.rs b/app/buck2_query/src/query/graph/vec_as_map.rs
@@ -11,7 +11,6 @@
 
 use std::fmt;
 use std::fmt::Debug;
-use std::mem;
 
 /// Map `u32` to `T`.
 pub(crate) struct VecAsMap<T> {
@@ -58,6 +57,6 @@ impl<T> VecAsMap<T> {
         if self.vec.len() <= index as usize {
             self.vec.resize_with(index as usize + 1, || None);
         }
-        mem::replace(&mut self.vec[index as usize], Some(value))
+        self.vec[index as usize].replace(value)
     }
 }
diff --git a/app/buck2_server/src/daemon/server.rs b/app/buck2_server/src/daemon/server.rs
@@ -560,6 +560,7 @@ impl BuckdServer {
     }
 
     /// Checks if the server is accepting requests.
+    #[allow(clippy::result_large_err)]
     fn check_if_accepting_requests(&self) -> Result<(), Status> {
         if self.0.stop_accepting_requests.load(Ordering::Relaxed) {
             Err(Status::failed_precondition(
@@ -571,6 +572,7 @@ impl BuckdServer {
     }
 }
 
+#[allow(clippy::result_large_err)]
 fn convert_positive_duration(proto_duration: &prost_types::Duration) -> Result<Duration, Status> {
     if proto_duration.seconds < 0 || proto_duration.nanos < 0 {
         return Err(Status::new(
@@ -1494,6 +1496,7 @@ impl DaemonApi for BuckdServer {
 
 /// Options to configure the execution of a oneshot command (i.e. what happens in `oneshot()`).
 trait OneshotCommandOptions: Send + Sync + 'static {
+    #[allow(clippy::result_large_err)]
     fn pre_run(&self, server: &BuckdServer) -> Result<(), Status> {
         server.check_if_accepting_requests()
     }
diff --git a/app/buck2_server_ctx/src/stderr_output_guard.rs b/app/buck2_server_ctx/src/stderr_output_guard.rs
@@ -110,8 +110,7 @@ impl Write for StderrOutputWriter {
         if len > 0 {
             let s = StderrOutputWriter::truncate_str(buf, len)?;
             if s.is_empty() {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
+                return Err(io::Error::other(
                     "Configured chunk size is not enough to hold a single utf-8 character",
                 ));
             }
diff --git a/app/buck2_test/src/orchestrator.rs b/app/buck2_test/src/orchestrator.rs
@@ -1342,9 +1342,9 @@ impl BuckTestOrchestrator<'_> {
         dice: &mut DiceComputations<'_>,
         test_target: &ConfiguredProvidersLabel,
         test_info: &FrozenExternalRunnerTestInfo,
-        cmd: Cow<'a, Vec<ArgValue>>,
+        cmd: Cow<'a, [ArgValue]>,
         env: Cow<'a, SortedVectorMap<String, ArgValue>>,
-        pre_create_dirs: Cow<'a, Vec<DeclaredOutput>>,
+        pre_create_dirs: Cow<'a, [DeclaredOutput]>,
         executor_fs: &ExecutorFs<'_>,
         prefix: TestExecutionPrefix,
         opts: TestSessionOptions,
@@ -1714,7 +1714,7 @@ struct Execute2RequestExpander<'a> {
     output_root: &'a ForwardRelativePath,
     declared_outputs: &'a mut IndexMap<BuckOutTestPath, OutputCreationBehavior>,
     fs: &'a ExecutorFs<'a>,
-    cmd: Cow<'a, Vec<ArgValue>>,
+    cmd: Cow<'a, [ArgValue]>,
     env: Cow<'a, SortedVectorMap<String, ArgValue>>,
 }
 
diff --git a/app/buck2_util/src/future.rs b/app/buck2_util/src/future.rs
@@ -9,7 +9,6 @@
 
 use std::future::Future;
 use std::iter;
-use std::mem;
 
 use futures::FutureExt;
 use futures::StreamExt;
@@ -64,7 +63,7 @@ where
         while let Some((i, res)) = futs.next().await {
             match res {
                 Ok(v) => {
-                    let prev = mem::replace(&mut outputs[i], Some(v));
+                    let prev = outputs[i].replace(v);
                     assert!(prev.is_none());
                 }
                 Err(e) => return Err(e),
diff --git a/app/buck2_util/src/network_speed_average.rs b/app/buck2_util/src/network_speed_average.rs
@@ -7,7 +7,6 @@
  * of this source tree.
  */
 
-use std::mem;
 use std::time::Duration;
 use std::time::SystemTime;
 
@@ -34,7 +33,7 @@ impl NetworkSpeedAverage {
     /// Each update value must be greater than or equal to the previous one.
     /// Equal values are ignored during average calculation.
     pub fn update(&mut self, timestamp: SystemTime, value: u64) {
-        let last = mem::replace(&mut self.last_snapshot, Some(Snapshot { timestamp, value }));
+        let last = self.last_snapshot.replace(Snapshot { timestamp, value });
         if let Some((duration, value)) =
             NetworkSpeedAverage::elapsed_if_value_changed(&last, &Snapshot { timestamp, value })
         {
diff --git a/dice/dice/src/future.rs b/dice/dice/src/future.rs
@@ -11,7 +11,6 @@
 
 use std::future::Future;
 use std::iter;
-use std::mem;
 
 use futures::FutureExt;
 use futures::StreamExt;
@@ -66,7 +65,7 @@ where
         while let Some((i, res)) = futs.next().await {
             match res {
                 Ok(v) => {
-                    let prev = mem::replace(&mut outputs[i], Some(v));
+                    let prev = outputs[i].replace(v);
                     assert!(prev.is_none());
                 }
                 Err(e) => return Err(e),
diff --git a/docs/about/getting_started.md b/docs/about/getting_started.md
@@ -20,8 +20,8 @@ To get started, first install [rustup](https://rustup.rs/), then compile the
 `buck2` executable:
 
 ```bash
-rustup install nightly-2025-02-16
-cargo +nightly-2025-02-16 install --git https://github.com/facebook/buck2.git buck2
+rustup install nightly-2025-03-29
+cargo +nightly-2025-03-29 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
@@ -11,6 +11,6 @@
 #     has a dependency on buck2 git trunk.
 # * Update `../monarch/rust-toolchain` (one instance)
 
-# @rustc_version: rustc 1.86.0-nightly (9cd60bd2c 2025-02-15)
-channel = "nightly-2025-02-16"
+# @rustc_version: rustc 1.87.0-nightly (920d95eaf 2025-03-28)
+channel = "nightly-2025-03-29"
 components = ["llvm-tools-preview","rustc-dev","rust-src"]
diff --git a/starlark-rust/starlark/src/collections/alloca.rs b/starlark-rust/starlark/src/collections/alloca.rs
@@ -171,7 +171,7 @@ impl Alloca {
         // If the pointer changed, it means a callback called alloca again,
         // which allocated a new buffer. So we are abandoning the current allocation here,
         // and new allocations will use the new buffer even if the current buffer has space.
-        if likely(self.alloc.get() == stop) {
+        if likely(std::ptr::eq(self.alloc.get(), stop)) {
             self.alloc.set(old);
         }
 
diff --git a/starlark-rust/starlark/src/docs.rs b/starlark-rust/starlark/src/docs.rs
@@ -200,6 +200,7 @@ pub struct DocProperty {
 }
 
 /// A named member of an object.
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq, Allocative)]
 pub enum DocMember {
     Property(DocProperty),
diff --git a/starlark-rust/starlark/src/eval/compiler/expr.rs b/starlark-rust/starlark/src/eval/compiler/expr.rs
@@ -1025,6 +1025,7 @@ pub(crate) enum EvalError {
 
 /// Try fold expression `cmp(l == r)` into `cmp(type(x) == "y")`.
 /// Return original `l` and `r` arguments if fold was unsuccessful.
+#[allow(clippy::result_large_err)]
 fn try_eval_type_is(
     l: IrSpanned<ExprCompiled>,
     r: IrSpanned<ExprCompiled>,
diff --git a/starlark-rust/starlark/src/eval/compiler/scope.rs b/starlark-rust/starlark/src/eval/compiler/scope.rs
@@ -1125,7 +1125,7 @@ impl<'f> Binding<'f> {
 
     /// Initialize the slot during analysis.
     pub(crate) fn init_slot(&mut self, slot: Slot, codemap: &CodeMap) -> Result<(), InternalError> {
-        match mem::replace(&mut self.slot, Some(slot)) {
+        match self.slot.replace(slot) {
             Some(_) => Err(InternalError::msg(
                 "slot is already assigned",
                 self.span(),
diff --git a/starlark-rust/starlark/src/values/layout/heap/allocator/alloc/per_thread.rs b/starlark-rust/starlark/src/values/layout/heap/allocator/alloc/per_thread.rs
diff --git a/starlark-rust/starlark/src/values/layout/heap/heap_type.rs b/starlark-rust/starlark/src/values/layout/heap/heap_type.rs
diff --git a/starlark-rust/starlark_derive/src/module/render/fun.rs b/starlark-rust/starlark_derive/src/module/render/fun.rs
diff --git a/starlark-rust/starlark_derive/src/module/typ.rs b/starlark-rust/starlark_derive/src/module/typ.rs
diff --git a/superconsole/src/output.rs b/superconsole/src/output.rs

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,6 @@ impl VisitorImpl for FlameGraphBuilder {`
`451`	`451`	`self.current().current_data().unique = true;`
`452`	`452`	`}`
`453`	`453`
`454`		`- #[must_use]`
`455`	`454`	`fn enter_shared_impl(`
`456`	`455`	`&mut self,`
`457`	`456`	`name: Key,`
Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,7 @@ pub(crate) struct RunAction {`
`305`	`305`	`input_files_bytes: u64,`
`306`	`306`	`}`
`307`	`307`
	`308`	`+#[allow(clippy::large_enum_variant)]`
`308`	`309`	`enum ExecuteResult {`
`309`	`310`	`LocalDepFileHit(ActionOutputs, ActionExecutionMetadata),`
`310`	`311`	`ExecutedOrReHit {`
Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ impl<'a> BuildReportCollector<'a> {`
`645`	`645`	`self.strings`
`646`	`646`	`.get(&out.last().unwrap().message_content)`
`647`	`647`	`.unwrap()`
`648`		`- .to_string(),`
	`648`	`+ .to_owned(),`
`649`	`649`	`);`
`650`	`650`	`}`
`651`	`651`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ impl<V: ValueLifetimeless> TransitiveSetOperationsGen<V> {`
`146`	`146`	`.iter()`
`147`	`147`	`.filter_map(\|(k, spec)\| {`
`148`	`148`	`if kind == spec.kind {`
`149`		`- Some(k.to_string())`
	`149`	`+ Some(k.to_owned())`
`150`	`150`	`} else {`
`151`	`151`	`None`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -869,6 +869,7 @@ async fn start_new_buckd_and_connect(`
`869`	`869`	`Ok(client)`
`870`	`870`	`}`
`871`	`871`
	`872`	`+#[allow(clippy::large_enum_variant)]`
`872`	`873`	`enum ConnectBeforeRestart {`
`873`	`874`	`Accepted(BootstrapBuckdClient),`
`874`	`875`	`Rejected,`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ impl CompleteCommand {`
`108`	`108`	`matches: BuckArgMatches<'_>,`
`109`	`109`	`ctx: ClientCommandContext<'_>,`
`110`	`110`	`) -> ExitResult {`
`111`		`- let exit_result = match self.partial_target.split(':').collect::<Vec<_>>()[..] {`
	`111`	`+ match self.partial_target.split(':').collect::<Vec<_>>()[..] {`
`112`	`112`	`// Package completion is performed locally and called here directly`
`113`	`113`	`[given_partial_package] => {`
`114`	`114`	`let roots = &ctx.paths()?.roots;`
`@@ -130,8 +130,7 @@ impl CompleteCommand {`
`130`	`130`	`"Malformed target string (expected [[cell]//][path/to/package][:target_name])",`
`131`	`131`	`)`
`132`	`132`	`.into(),`
`133`		`- };`
`134`		`- exit_result`
	`133`	`+ }`
`135`	`134`	`}`
`136`	`135`	`}`
`137`	`136`