clean up a little more

pantsbuild · May 24, 2018 · 322c16e · 322c16e
1 parent 8d36c17
commit 322c16e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/python/pants/bin/goal_runner.py b/src/python/pants/bin/goal_runner.py
@@ -244,7 +244,7 @@ def subsystems(cls):
     }
 
   def _execute_engine(self):
-    workdir = self._global_options.pants_workdir
+    workdir = self._context.options.for_global_scope().pants_workdir
     if not workdir.endswith('.pants.d'):
       self._context.log.error('Pants working directory should end with \'.pants.d\', currently it is {}\n'
                               .format(workdir))

diff --git a/src/rust/engine/src/lib.rs b/src/rust/engine/src/lib.rs
@@ -47,8 +47,8 @@ use externs::{Buffer, BufferBuffer, CallExtern, CloneValExtern, CreateExceptionE
               DropHandlesExtern, EqualsExtern, EvalExtern, ExternContext, Externs,
               GeneratorSendExtern, IdentifyExtern, LogExtern, ProjectIgnoringTypeExtern,
               ProjectMultiExtern, PyResult, SatisfiedByExtern, SatisfiedByTypeExtern,
-              StoreBytesExtern, StoreI64Extern, StoreTupleExtern, TypeIdBuffer,
-              TypeToStrExtern, ValToStrExtern};
+              StoreBytesExtern, StoreI64Extern, StoreTupleExtern, TypeIdBuffer, TypeToStrExtern,
+              ValToStrExtern};
 use futures::Future;
 use rule_graph::{GraphMaker, RuleGraph};
 use scheduler::{ExecutionRequest, RootResult, Scheduler, Session};