Noratrieb/stuff
1
0
Fork 0
mirror of https://github.com/Noratrieb/stuff.git synced 2026-01-14 08:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lower msrv to 1.31.1

Browse source 
edition 2015 is behind that, I won't touch that
This commit is contained in:
nora 2022-04-06 19:38:40 +02:00
parent ee7e477006
commit c52472a874
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -11,7 +11,7 @@ license = "MIT"
keywords = ["unsafe", "pointer", "bitpacking", "provenance", "tagging"]
categories = ["data-structures", "memory-management", "no-std"]
include = ["Cargo.toml", "LICENSE", "src", "README.md"]
rust-version = "1.32.0"
rust-version = "1.31.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

4
src/backend.rs
View file

@ -87,7 +87,7 @@ unsafe impl<T> Backend<T> for u64 {
}
macro_rules! impl_backend_2_tuple {
(impl for $ty:ty { (*mut T, $int:ident), $num:literal }) => {
(impl for $ty:ty { (*mut T, $int:ident), $num:expr }) => {
unsafe impl<T> Backend<T> for $ty {
// this one keeps the MSB in the pointer address, and the LSB in the integer
@ -114,7 +114,7 @@ macro_rules! impl_backend_2_tuple {
/// num1 is ptr-sized, num2 is 2*ptr sized
#[cfg_attr(target_pointer_width = "64", allow(unused))] // not required on 64 bit
macro_rules! impl_backend_3_tuple {
(impl for $ty:ty { (*mut T, $int1:ident, $int2:ident), $num1:literal, $num2:literal }) => {
(impl for $ty:ty { (*mut T, $int1:ident, $int2:ident), $num1:expr, $num2:expr }) => {
unsafe impl<T> Backend<T> for $ty {
// this one keeps the MSB in the pointer address, ISB in int1 and the LSB in the int2

6
src/lib.rs
View file

@ -131,7 +131,7 @@ where
pub fn new_ptr(ptr: *mut T) -> Self {
let addr = Strict::addr(ptr);
let stuffed = S::stuff_ptr(addr);
Self(B::set_ptr(ptr, stuffed), PhantomData)
StuffedPtr(B::set_ptr(ptr, stuffed), PhantomData)
}
/// Create a new `StuffPtr` from extra data
@ -140,7 +140,7 @@ where
// if the user calls `set_ptr` it will use the new provenance from that ptr
let ptr = core::ptr::null_mut();
let extra = S::stuff_extra(extra);
Self(B::set_ptr(ptr, extra), PhantomData)
StuffedPtr(B::set_ptr(ptr, extra), PhantomData)
}
/// Get the pointer data, or `None` if it contains extra data
@ -280,7 +280,7 @@ where
Self::new_extra(cloned_extra)
} else {
// just copy the pointer
Self(self.0, PhantomData)
StuffedPtr(self.0, PhantomData)
}
}
}