This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
The following commit(s) were added to refs/heads/develop by this push:
new 00fc0e5 Use the bail macro to replace return Err(anyhow!())
00fc0e5 is described below
commit 00fc0e5fe05711c2c272ad4ef938fe2f1befc3ab
Author: Mingshen Sun <[email protected]>
AuthorDate: Mon Mar 23 17:56:09 2020 -0700
Use the bail macro to replace return Err(anyhow!())
---
services/management/enclave/src/task.rs | 20 ++++++++++----------
services/proto/src/teaclave_common.rs | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/services/management/enclave/src/task.rs
b/services/management/enclave/src/task.rs
index 5d0b6be..0222958 100644
--- a/services/management/enclave/src/task.rs
+++ b/services/management/enclave/src/task.rs
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-use anyhow::{anyhow, ensure, Result};
+use anyhow::{bail, ensure, Result};
use std::collections::HashMap;
use std::collections::HashSet;
use std::prelude::v1::*;
@@ -96,21 +96,21 @@ pub(crate) fn assign_input_to_task(
user_id: &str,
) -> Result<()> {
if !file.owner.contains(&user_id.to_string()) {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
match task.input_data_owner_list.get(data_name) {
Some(data_owner_list) => {
let user_id_list = &data_owner_list.user_id_list;
if user_id_list.len() != file.owner.len() {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
for owner in user_id_list.iter() {
if !file.owner.contains(owner) {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
}
}
- None => return Err(anyhow!("no such input name")),
+ None => bail!("no such input name"),
};
task.input_map
.insert(data_name.to_owned(), file.external_id());
@@ -129,24 +129,24 @@ pub(crate) fn assign_output_to_task(
user_id: &str,
) -> Result<()> {
if file.hash.is_some() {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
if !file.owner.contains(&user_id.to_string()) {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
match task.output_data_owner_list.get(data_name) {
Some(data_owner_list) => {
let user_id_list = &data_owner_list.user_id_list;
if user_id_list.len() != file.owner.len() {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
for owner in user_id_list.iter() {
if !file.owner.contains(owner) {
- return Err(anyhow!("no permission"));
+ bail!("no permission");
}
}
}
- None => return Err(anyhow!("no such output name")),
+ None => bail!("no such output name"),
};
task.output_map
.insert(data_name.to_owned(), file.external_id());
diff --git a/services/proto/src/teaclave_common.rs
b/services/proto/src/teaclave_common.rs
index 7686ccb..165ccc8 100644
--- a/services/proto/src/teaclave_common.rs
+++ b/services/proto/src/teaclave_common.rs
@@ -19,7 +19,7 @@
use std::prelude::v1::*;
use crate::teaclave_common_proto as proto;
-use anyhow::{anyhow, Error, Result};
+use anyhow::{bail, Error, Result};
use teaclave_types::{TaskStatus, TeaclaveFileCryptoInfo,
TeaclaveFileRootKey128};
#[derive(Debug)]
@@ -109,7 +109,7 @@ pub fn i32_to_task_status(status: i32) ->
Result<TaskStatus> {
Some(proto::TaskStatus::Running) => TaskStatus::Running,
Some(proto::TaskStatus::Failed) => TaskStatus::Failed,
Some(proto::TaskStatus::Finished) => TaskStatus::Finished,
- None => return Err(anyhow!("invalid task status")),
+ None => bail!("invalid task status"),
};
Ok(ret)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
