nixd: add non null getters for StreamProc

nix-community · Apr 17, 2024 · d4cef26 · d4cef26
1 parent 4801001
commit d4cef26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/nixd/include/nixd/Support/StreamProc.h b/nixd/include/nixd/Support/StreamProc.h
@@ -8,15 +8,27 @@
 namespace nixd {
 
 struct StreamProc {
+private:
   std::unique_ptr<util::PipedProc> Proc;
   std::unique_ptr<llvm::raw_fd_ostream> Stream;
 
+public:
   /// \brief Launch a streamed process with \p Action.
   ///
   /// The value returned by \p Action will be interpreted as process's exit
   /// value.
   StreamProc(const std::function<int()> &Action);
 
+  [[nodiscard]] llvm::raw_fd_ostream &stream() const {
+    assert(Stream);
+    return *Stream;
+  }
+
+  [[nodiscard]] util::PipedProc &proc() const {
+    assert(Proc);
+    return *Proc;
+  }
+
   [[nodiscard]] std::unique_ptr<lspserver::InboundPort> mkIn() const;
 
   [[nodiscard]] std::unique_ptr<lspserver::OutboundPort> mkOut() const;

diff --git a/nixd/lib/Eval/AttrSetClient.cpp b/nixd/lib/Eval/AttrSetClient.cpp
@@ -34,7 +34,7 @@ AttrSetClientProc::AttrSetClientProc(const std::function<int()> &Action)
       Input([this]() { Client.run(); }) {}
 
 AttrSetClient *AttrSetClientProc::client() {
-  if (!kill(Proc.Proc->PID, 0))
+  if (!kill(Proc.proc().PID, 0))
     return &Client;
   return nullptr;
 }