Skip to content

Commit

Permalink
Update Rust to 1.61.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zmb3 committed May 20, 2022
1 parent 5ec15cb commit 0ad639e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.assets/Makefile
Expand Up @@ -18,7 +18,7 @@ OS ?= linux
ARCH ?= amd64
BUILDBOX_VERSION ?= teleport10
GOLANG_VERSION ?= go1.18.2
RUST_VERSION ?= 1.58.1
RUST_VERSION ?= 1.61.0
BORINGCRYPTO_RUNTIME=$(GOLANG_VERSION)b7
LIBBPF_VERSION ?= 0.3.1

Expand Down
4 changes: 1 addition & 3 deletions lib/datalog/roletester/src/role_tester.rs
Expand Up @@ -17,7 +17,6 @@
// so we just disable it for the entire file
#![allow(clippy::collapsible_if)]

use bytes::BytesMut;
use crepe::crepe;
use libc::{c_uchar, size_t};
use prost::Message;
Expand Down Expand Up @@ -107,8 +106,7 @@ fn create_error_ptr(e: String) -> Output {
#[no_mangle]
pub unsafe extern "C" fn process_access(input: *mut c_uchar, input_len: size_t) -> *mut Output {
let mut runtime = Crepe::new();
let b = slice::from_raw_parts_mut(input, input_len);
let r = match types::Facts::decode(BytesMut::from(&b[..])) {
let r = match types::Facts::decode(slice::from_raw_parts(input, input_len)) {
Ok(b) => b,
Err(e) => return Box::into_raw(Box::new(create_error_ptr(e.to_string()))),
};
Expand Down
2 changes: 1 addition & 1 deletion lib/srv/desktop/rdp/rdpclient/src/piv.rs
Expand Up @@ -408,7 +408,7 @@ fn tlv_tag(val: u8) -> RdpResult<Tag> {
}

fn hex_data<const S: usize>(cmd: &Command<S>) -> String {
to_hex(&cmd.data().to_vec())
to_hex(cmd.data())
}

fn to_hex(bytes: &[u8]) -> String {
Expand Down

0 comments on commit 0ad639e

Please sign in to comment.