Skip to content

Commit

Permalink
pass tests and lint
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicexplorer committed Nov 17, 2020
1 parent 43d02e7 commit 724cb24
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 68 deletions.
18 changes: 9 additions & 9 deletions src/rust/engine/src/externs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,10 @@ pub fn call_method(value: &PyObject, method: &str, args: &[Value]) -> Result<PyO
}

pub fn into_value_result(py_result: Result<PyObject, PyErr>) -> Result<Value, Failure> {
match py_result {
Ok(obj) => Ok(Value::from(obj)),
Err(err) => Err(Failure::from_py_err(err)),
}
match py_result {
Ok(obj) => Ok(Value::from(obj)),
Err(err) => Err(Failure::from_py_err(err)),
}
}

pub fn call_function(func: &PyObject, args: &[Value]) -> Result<PyObject, PyErr> {
Expand Down Expand Up @@ -374,7 +374,7 @@ pub fn generator_send(
} else if let Ok(throw) = response.cast_as::<PyGeneratorResponseThrow>(py) {
let new_err_val = Value::new(throw.err(py).clone_ref(py));
match arg {
Err(err) => {
Err(err) => {
// If this is the same error that we previously sent, then just return the previous error to
// preserve the stacktraces.
let err_is_same_as_last_time = err
Expand All @@ -391,10 +391,10 @@ pub fn generator_send(
Ok(GeneratorResponse::Throw(joined_failure))
}
}
// We didn't have an error before, but we do now, so just return a new Failure instance.
Ok(_) => Ok(GeneratorResponse::Throw(
Failure::from_py_err_value(new_err_val),
)),
// We didn't have an error before, but we do now, so just return a new Failure instance.
Ok(_) => Ok(GeneratorResponse::Throw(Failure::from_py_err_value(
new_err_val,
))),
}
} else {
panic!("generator_send returned unrecognized type: {:?}", response);
Expand Down
7 changes: 1 addition & 6 deletions src/rust/engine/src/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,5 @@ fn digest_subset_to_digest(
}

fn session_values(context: Context, _args: Vec<Value>) -> BoxFuture<'static, NodeResult<Value>> {
async move {
context
.get(SessionValues)
.await?
}
.boxed()
async move { context.get(SessionValues).await? }.boxed()
}
78 changes: 25 additions & 53 deletions src/rust/engine/src/nodes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,10 @@ impl Select {
))
})?;
let context = context.clone();
let result: Result<Value, Failure> = Select::new_from_edges(self.params.clone(), product, &edges)
.run_wrapped_node(context)
.await?;
let result: Result<Value, Failure> =
Select::new_from_edges(self.params.clone(), product, &edges)
.run_wrapped_node(context)
.await?;
result
}
}
Expand Down Expand Up @@ -981,9 +982,11 @@ impl Task {
let results = Self::gen_get(&context, &params, &entry, gets).await?;
// If any of the sub-Gets fail, we return the result of the first failing Get in the given
// sequence as an Result<Value, Failure>, and discard the rest.
input = Ok(externs::store_tuple(results
.into_iter()
.collect::<Result<Vec<Value>, Failure>>()?));
input = Ok(externs::store_tuple(
results
.into_iter()
.collect::<Result<Vec<Value>, Failure>>()?,
));
}
externs::GeneratorResponse::Break(val) => {
break Ok(Ok(val));
Expand Down Expand Up @@ -1032,8 +1035,10 @@ impl Task {
.into_iter()
.collect::<Result<Vec<Value>, Failure>>()?;
// The params were all successfully collected, now call the current @rule function with them.
let result: Result<Value, Failure> =
externs::into_value_result(externs::call_function(&externs::val_for(&func.0), &param_deps));
let result: Result<Value, Failure> = externs::into_value_result(externs::call_function(
&externs::val_for(&func.0),
&param_deps,
));
// If the result of calling the current @rule was an exception, exit with that.
result?
};
Expand Down Expand Up @@ -1101,7 +1106,7 @@ impl WrappedNode for Task {
let function_call_result: Result<Value, Failure> =
Self::run_wrapped_node_helper(deps, &context, params, product, func, entry)
.await
.into();
.into();
let function_call_result2 = function_call_result.clone();
let (new_level, message, new_artifacts, new_metadata) = {
// Get the returned object or raised exception as a Value, and extract any engine-aware
Expand All @@ -1112,9 +1117,9 @@ impl WrappedNode for Task {
engine_aware::EngineAwareLevel::retrieve(&context.core.types, &result_val),
engine_aware::Message::retrieve(&context.core.types, &result_val),
engine_aware::Artifacts::retrieve(&context.core.types, &result_val)
.unwrap_or_else(Vec::new),
engine_aware::Metadata::retrieve(&context.core.types,
&result_val).unwrap_or_else(Vec::new),
.unwrap_or_else(Vec::new),
engine_aware::Metadata::retrieve(&context.core.types, &result_val)
.unwrap_or_else(Vec::new),
)
} else {
(None, None, Vec::new(), Vec::new())
Expand All @@ -1124,8 +1129,8 @@ impl WrappedNode for Task {
value: function_call_result2,
new_level,
message,
new_artifacts,
new_metadata
new_artifacts,
new_metadata,
})
}
}
Expand Down Expand Up @@ -1357,7 +1362,7 @@ impl Node for NodeKey {
let mut user_metadata = Vec::new();

let context2 = context.clone();
let result = match self {
let mut result = match self {
NodeKey::DigestFile(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Digest).await,
NodeKey::DownloadedFile(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Digest).await,
NodeKey::MultiPlatformExecuteProcess(n) => {
Expand All @@ -1375,18 +1380,10 @@ impl Node for NodeKey {
.map_ok(NodeOutput::DirectoryListing)
.await
}
NodeKey::Select(n) => {
n.run_wrapped_node(context)
.map_ok(NodeOutput::Result)
.await
}
NodeKey::Select(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Result).await,
NodeKey::Snapshot(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Digest).await,
NodeKey::Paths(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Paths).await,
NodeKey::SessionValues(n) => {
n.run_wrapped_node(context)
.map_ok(NodeOutput::Result)
.await
}
NodeKey::SessionValues(n) => n.run_wrapped_node(context).map_ok(NodeOutput::Result).await,
NodeKey::Task(n) => {
n.run_wrapped_node(context)
.map_ok(|python_rule_output| {
Expand All @@ -1403,39 +1400,14 @@ impl Node for NodeKey {
};

// Flatten any exceptions into an InvocationResult, but keep everything else unchanged.
let (result, was_failure): (NodeOutput, bool) = match result {
Ok(result) => match result {
NodeOutput::Result(result) => match result {
Ok(val) => (
NodeOutput::Result(Ok(val)),
false,
),
Err(failure) => (
// If an @rule raised or re-raised an exception.
NodeOutput::Result(
// Ensure that the engine stacktrace covers the current frame.
Err(failure.with_pushed_frame(&failure_name)),
),
true,
),
},
x => (x, false),
},
Err(failure) => (
// If there was a failure with an intrinsic or any of the other NodeKeys above.
NodeOutput::Result(
// Ensure that the engine stacktrace covers the current frame.
Err(failure.with_pushed_frame(&failure_name)),
),
true,
),
};
result = result.map_err(|failure| failure.with_pushed_frame(&failure_name));
let was_failure = !result.is_ok();

// If both the Node and the watch failed, prefer the Node's error message. If *only* the watch
// failed, then use that one.
let result: Result<NodeOutput, Failure> = match (was_failure, maybe_watch) {
(false, Err(e)) => Err(e),
_ => Ok(result),
_ => result,
};

let session = context2.session;
Expand Down

0 comments on commit 724cb24

Please sign in to comment.