summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/daemon.zig4
-rw-r--r--src/main.zig6
-rw-r--r--src/replica.zig6
-rw-r--r--src/wire.zig (renamed from src/detached/wire.zig)2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/daemon.zig b/src/daemon.zig
index fff7bbe5..7d2ca9b4 100644
--- a/src/daemon.zig
+++ b/src/daemon.zig
@@ -19,14 +19,14 @@
//!
//! A replica (docs/next-daemon.md, phase 5) comes in on a stream socket of
//! its own, `pardes-replica.sock`, which `ssh -L` can forward: its hello
-//! (detached/wire.zig) names a session, and once its build is the session's
+//! (wire.zig) names a session, and once its build is the session's
//! the connection is handed to that session, which it talks to from then on.
const std = @import("std");
const builtin = @import("builtin");
const libc = std.c;
const posix = std.posix;
const ninep_io = @import("9p_io.zig");
-const wire = @import("detached/wire.zig");
+const wire = @import("wire.zig");
const upgrade = @import("upgrade.zig");
const log = std.log.scoped(.replica);
diff --git a/src/main.zig b/src/main.zig
index 9092e2f9..2b50273c 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -315,11 +315,11 @@ fn badArgs(io: std.Io, comptime fmt: []const u8, args: anytype) noreturn {
}
/// The second line is what a replica's build must share with its session's
-/// (detached/wire.zig `semantics`).
+/// (wire.zig `semantics`).
const version_text = (if (pardes.commit) |c|
"pardes " ++ pardes.version ++ " (" ++ c ++ ")\n"
else
- "pardes " ++ pardes.version ++ "\n") ++ std.fmt.comptimePrint("semantics {x:0>16}\n", .{@import("detached/wire.zig").semantics});
+ "pardes " ++ pardes.version ++ "\n") ++ std.fmt.comptimePrint("semantics {x:0>16}\n", .{@import("wire.zig").semantics});
const nested_text =
\\pardes: this shell is already inside pardes, and a pardes inside a pardes
@@ -1176,7 +1176,7 @@ test {
_ = @import("memory.zig");
_ = @import("locations.zig");
_ = @import("fs.zig");
- _ = @import("detached/wire.zig");
+ _ = @import("wire.zig");
_ = @import("ShaderBuild.zig");
_ = @import("vaxis_input.zig");
_ = @import("daemon.zig");
diff --git a/src/replica.zig b/src/replica.zig
index e567587c..633080e7 100644
--- a/src/replica.zig
+++ b/src/replica.zig
@@ -18,7 +18,7 @@
//! and the comparison catches a guess the authority did not share.
//!
//! No transport: messages are bytes in and out. A client's input is its
-//! id, a sequence number and the event as detached/wire.zig frames it; a
+//! id, a sequence number and the event as wire.zig frames it; a
//! unit is the input's origin (0 for the authority's own: a pty's output, a
//! tick), its sequence number and the authority's tape of it.
const std = @import("std");
@@ -27,7 +27,7 @@ const pardes = @import("pardes.zig");
const tape = @import("tape.zig");
const rollback = @import("rollback.zig");
const walk = @import("walk.zig");
-const wire = @import("detached/wire.zig");
+const wire = @import("wire.zig");
const screen_state = @import("screen_state.zig");
const c_heap = @import("c_heap");
const terminal = pardes.panes.terminal;
@@ -1338,7 +1338,7 @@ pub const Framer = struct {
f.z = null;
}
- /// Framed messages off `fd` (detached/wire.zig) handed to `take` until
+ /// Framed messages off `fd` (wire.zig) handed to `take` until
/// the stream ends, `take` says stop, or a message is malformed. An
/// envelope's are handed on as if they had come bare.
fn run(fr: *Framer, gpa: Allocator, fd: c_int, ctx: anytype, comptime take: fn (@TypeOf(ctx), u8, []const u8) bool) void {
diff --git a/src/detached/wire.zig b/src/wire.zig
index 9d1abee5..d572d469 100644
--- a/src/detached/wire.zig
+++ b/src/wire.zig
@@ -6,7 +6,7 @@
//! them, went with phase 3.
const std = @import("std");
const builtin = @import("builtin");
-const pardes = @import("../pardes.zig");
+const pardes = @import("pardes.zig");
const config = @import("pardes_config");
/// 19: a client joining again names the view it had in its hello, and a