about summary refs log tree commit diff
path: root/users/picnoir
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-04-10T12·43+0300
committerflokli <flokli@flokli.de>2024-04-13T10·09+0000
commit742937d55c1e156933b463312b77ca07ebd1d063 (patch)
treecd208dafe3b8d3ef0b525724353c95d2e1ceff7e /users/picnoir
parent36b296609b0d4db633f78a6fa3685f61227af94a (diff)
refactor(tvix/nix-compat): move worker_protocol into nix_daemon mod r/7897
This doesn't have much to do with the plain "wire" format, it's merely
one user of it.

Also, use the more "public" `wire::` API to read/write bytes, strings,
bools and u64s.

Change-Id: I98dddcc3004dfde7a0c009958fe84a840f77b188
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11390
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Reviewed-by: Brian Olsen <me@griff.name>
Diffstat (limited to 'users/picnoir')
-rw-r--r--users/picnoir/tvix-daemon/src/main.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/users/picnoir/tvix-daemon/src/main.rs b/users/picnoir/tvix-daemon/src/main.rs
index 33501001285b..27bec90ce47f 100644
--- a/users/picnoir/tvix-daemon/src/main.rs
+++ b/users/picnoir/tvix-daemon/src/main.rs
@@ -3,10 +3,8 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio_listener::{self, SystemOptions, UserOptions};
 use tracing::{debug, error, info, instrument, Level};
 
-use nix_compat::wire::{
-    self,
-    worker_protocol::{self, server_handshake_client, ClientSettings, Trust},
-};
+use nix_compat::wire;
+use nix_compat::worker_protocol::{self, server_handshake_client, ClientSettings, Trust};
 
 #[derive(Parser, Debug)]
 struct Cli {