folly: improve Subprocess::enforce() error message

Summary: Previous implementation only printed the desired state, not the actual runtime state. Fix that.

Test Plan: n/a

Reviewed By: tudorb@fb.com

FB internal diff: D936279

diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index fb4c19a95ee9bb1e998b426449cb2f1709112751..846076dd22c0e7ccefe91e07917d5e4e4cf0666d 100644 (file)
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -54,9 +54,11 @@ ProcessReturnCode::State ProcessReturnCode::state() const {
       "Invalid ProcessReturnCode: ", rawStatus_));
 }
 
-void ProcessReturnCode::enforce(State s) const {
-  if (state() != s) {
-    throw std::logic_error(to<std::string>("Invalid state ", s));
+void ProcessReturnCode::enforce(State expected) const {
+  State s = state();
+  if (s != expected) {
+    throw std::logic_error(to<std::string>("Invalid state ", s,
+                                           " expected ", expected));
   }
 }