diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2020-03-12 13:07:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 18:07:57 +0100 |
| commit | 3ac642c183981a366e1db565c16b81f864b07ee4 (patch) | |
| tree | dd009b5393ee217a9d58ae63ca8619181f698e3e | |
| parent | 63cee35691451e85e2c9bb5b88022c8a396d7428 (diff) | |
upgrade: Rust 1.42.0 (#4331)
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | cli/ops/permissions.rs | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 610ebcb61..2ddfde537 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: - name: Install rust uses: hecrj/setup-rust-action@v1 with: - rust-version: "1.41.0" + rust-version: "1.42.0" - name: Install clippy and rustfmt if: matrix.kind == 'lint' diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs index 6d109e0a8..55358b760 100644 --- a/cli/ops/permissions.rs +++ b/cli/ops/permissions.rs @@ -43,11 +43,11 @@ pub fn op_query_permission( ) -> Result<JsonOp, OpError> { let args: PermissionArgs = serde_json::from_value(args)?; let state = state.borrow(); - let resolved_path = args.path.as_ref().map(String::as_str).map(resolve_path); + let resolved_path = args.path.as_deref().map(resolve_path); let perm = state.permissions.get_permission_state( &args.name, - &args.url.as_ref().map(String::as_str), - &resolved_path.as_ref().map(String::as_str).map(Path::new), + &args.url.as_deref(), + &resolved_path.as_deref().map(Path::new), )?; Ok(JsonOp::Sync(json!({ "state": perm.to_string() }))) } @@ -70,11 +70,11 @@ pub fn op_revoke_permission( "hrtime" => permissions.allow_hrtime.revoke(), _ => {} }; - let resolved_path = args.path.as_ref().map(String::as_str).map(resolve_path); + let resolved_path = args.path.as_deref().map(resolve_path); let perm = permissions.get_permission_state( &args.name, - &args.url.as_ref().map(String::as_str), - &resolved_path.as_ref().map(String::as_str).map(Path::new), + &args.url.as_deref(), + &resolved_path.as_deref().map(Path::new), )?; Ok(JsonOp::Sync(json!({ "state": perm.to_string() }))) } @@ -87,16 +87,16 @@ pub fn op_request_permission( let args: PermissionArgs = serde_json::from_value(args)?; let mut state = state.borrow_mut(); let permissions = &mut state.permissions; - let resolved_path = args.path.as_ref().map(String::as_str).map(resolve_path); + let resolved_path = args.path.as_deref().map(resolve_path); let perm = match args.name.as_ref() { "run" => Ok(permissions.request_run()), - "read" => Ok(permissions.request_read( - &resolved_path.as_ref().map(String::as_str).map(Path::new), - )), - "write" => Ok(permissions.request_write( - &resolved_path.as_ref().map(String::as_str).map(Path::new), - )), - "net" => permissions.request_net(&args.url.as_ref().map(String::as_str)), + "read" => { + Ok(permissions.request_read(&resolved_path.as_deref().map(Path::new))) + } + "write" => { + Ok(permissions.request_write(&resolved_path.as_deref().map(Path::new))) + } + "net" => permissions.request_net(&args.url.as_deref()), "env" => Ok(permissions.request_env()), "plugin" => Ok(permissions.request_plugin()), "hrtime" => Ok(permissions.request_hrtime()), |