Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Rust to 1.61.0 #12779

Merged
merged 2 commits into from Jun 1, 2022
Merged

Update Rust to 1.61.0 #12779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d513b5
Update Rust to 1.61.0
zmb3 May 20, 2022
2e4dc65
Merge branch 'master' into zmb3/rust-update
zmb3 Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.assets/Makefile
View file
Open in desktop
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
View file
Open in desktop
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