From 2cae6a02b9267e794c77cc052927dcfc5839d979 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 17 Oct 2023 14:37:15 +0000 Subject: refactor(nix-compat/nar/writer): use clone_into Equivalent to the existing code, but a little less cryptic. Change-Id: Ib9b2f9aedddc84d0e79840bba4cce01f92d9bc56 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9766 Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/nix-compat/src/nar/writer/async.rs | 3 +-- tvix/nix-compat/src/nar/writer/sync.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tvix/nix-compat/src/nar/writer/async.rs b/tvix/nix-compat/src/nar/writer/async.rs index 2b73e56737..dd5c72ac89 100644 --- a/tvix/nix-compat/src/nar/writer/async.rs +++ b/tvix/nix-compat/src/nar/writer/async.rs @@ -203,8 +203,7 @@ impl<'a, 'w> Directory<'a, 'w> { _prev_name.as_bstr(), name.as_bstr() ); - _prev_name.clear(); - _prev_name.extend_from_slice(name); + name.clone_into(_prev_name); } self.node.write(&wire::TOK_PAR).await?; } diff --git a/tvix/nix-compat/src/nar/writer/sync.rs b/tvix/nix-compat/src/nar/writer/sync.rs index 9290e4a5bd..071aab831c 100644 --- a/tvix/nix-compat/src/nar/writer/sync.rs +++ b/tvix/nix-compat/src/nar/writer/sync.rs @@ -192,8 +192,7 @@ impl<'a, 'w> Directory<'a, 'w> { _prev_name.as_bstr(), name.as_bstr() ); - _prev_name.clear(); - _prev_name.extend_from_slice(name); + name.clone_into(_prev_name); } self.node.write(&wire::TOK_PAR)?; } -- cgit 1.4.1