Skip to content

Commit

Permalink
Remove deprecated FromBytes::(mut_)slice_from items (#1923)
Browse files Browse the repository at this point in the history
These are causing PMEs in the presence of `-C link-dead-code`,
which casues them to be monomorphized for `Self = ()`, thus
producing the problematic ZSTy DST `[()]`.

Also bumps version to 0.8.6.

Ref rust-lang/rust#131793
Fixes #1867
  • Loading branch information
jswrenn authored Oct 16, 2024
1 parent c5fb5aa commit 0bee231
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 27 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[package]
edition = "2021"
name = "zerocopy"
version = "0.8.5"
version = "0.8.6"
authors = ["Joshua Liebow-Feeser <joshlf@google.com>"]
description = "Zerocopy makes zero-cost memory manipulation effortless. We write \"unsafe\" so you don't have to."
categories = ["embedded", "encoding", "no-std::no-alloc", "parsing", "rust-patterns"]
Expand Down Expand Up @@ -77,13 +77,13 @@ std = ["alloc"]
__internal_use_only_features_that_work_on_stable = ["alloc", "derive", "simd", "std"]

[dependencies]
zerocopy-derive = { version = "=0.8.5", path = "zerocopy-derive", optional = true }
zerocopy-derive = { version = "=0.8.6", path = "zerocopy-derive", optional = true }

# The "associated proc macro pattern" ensures that the versions of zerocopy and
# zerocopy-derive remain equal, even if the 'derive' feature isn't used.
# See: https://github.com/matklad/macro-dep-test
[target.'cfg(any())'.dependencies]
zerocopy-derive = { version = "=0.8.5", path = "zerocopy-derive" }
zerocopy-derive = { version = "=0.8.6", path = "zerocopy-derive" }

[dev-dependencies]
itertools = "0.11"
Expand All @@ -97,6 +97,6 @@ testutil = { path = "testutil" }
# CI test failures.
trybuild = { version = "=1.0.89", features = ["diff"] }
# In tests, unlike in production, zerocopy-derive is not optional
zerocopy-derive = { version = "=0.8.5", path = "zerocopy-derive" }
zerocopy-derive = { version = "=0.8.6", path = "zerocopy-derive" }
# TODO(#381) Remove this dependency once we have our own layout gadgets.
elain = "0.3.0"
22 changes: 0 additions & 22 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4544,17 +4544,6 @@ pub unsafe trait FromBytes: FromZeros {
Self::mut_from_bytes(source).ok()
}

#[deprecated(since = "0.8.0", note = "`FromBytes::ref_from_bytes` now supports slices")]
#[doc(hidden)]
#[must_use = "has no side effects"]
#[inline(always)]
fn slice_from(source: &[u8]) -> Option<&[Self]>
where
Self: Sized + Immutable,
{
<[Self]>::ref_from_bytes(source).ok()
}

#[deprecated(since = "0.8.0", note = "renamed to `FromBytes::ref_from_prefix_with_elems`")]
#[doc(hidden)]
#[must_use = "has no side effects"]
Expand All @@ -4577,17 +4566,6 @@ pub unsafe trait FromBytes: FromZeros {
<[Self]>::ref_from_suffix_with_elems(source, count).ok()
}

#[deprecated(since = "0.8.0", note = "`FromBytes::mut_from_bytes` now supports slices")]
#[must_use = "has no side effects"]
#[doc(hidden)]
#[inline(always)]
fn mut_slice_from(source: &mut [u8]) -> Option<&mut [Self]>
where
Self: Sized + IntoBytes,
{
<[Self]>::mut_from_bytes(source).ok()
}

#[deprecated(since = "0.8.0", note = "renamed to `FromBytes::mut_from_prefix_with_elems`")]
#[doc(hidden)]
#[must_use = "has no side effects"]
Expand Down
2 changes: 1 addition & 1 deletion zerocopy-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[package]
edition = "2021"
name = "zerocopy-derive"
version = "0.8.5"
version = "0.8.6"
authors = ["Joshua Liebow-Feeser <joshlf@google.com>"]
description = "Custom derive for traits from the zerocopy crate"
license = "BSD-2-Clause OR Apache-2.0 OR MIT"
Expand Down

0 comments on commit 0bee231

Please sign in to comment.