Skip to content

Commit

Permalink
Make Bytes::from_static a const fn
Browse files Browse the repository at this point in the history
Rust versions bumped to the minimum needed for const slice len.
  • Loading branch information
andrewtj committed Nov 13, 2019
1 parent 9a10add commit 35b06e5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Expand Up @@ -20,7 +20,7 @@ jobs:
- template: ci/azure-test-stable.yml
parameters:
name: minrust
rust_version: 1.36.0
rust_version: 1.39.0
cmd: check

# Stable
Expand All @@ -37,7 +37,7 @@ jobs:
parameters:
name: nightly
# Pin nightly to avoid being impacted by breakage
rust_version: nightly-2019-07-17
rust_version: nightly-2019-09-25
benches: true

# Run tests on some extra platforms
Expand Down
13 changes: 12 additions & 1 deletion src/bytes.rs
Expand Up @@ -114,6 +114,17 @@ impl Bytes {
/// assert_eq!(&b[..], b"hello");
/// ```
#[inline]
#[cfg(not(all(loom, test)))]
pub const fn from_static(bytes: &'static [u8]) -> Bytes {
Bytes {
ptr: bytes.as_ptr(),
len: bytes.len(),
data: AtomicPtr::new(ptr::null_mut()),
vtable: &STATIC_VTABLE,
}
}

#[cfg(all(loom, test))]
pub fn from_static(bytes: &'static [u8]) -> Bytes {
Bytes {
ptr: bytes.as_ptr(),
Expand Down Expand Up @@ -732,7 +743,7 @@ impl fmt::Debug for Vtable {

// ===== impl StaticVtable =====

static STATIC_VTABLE: Vtable = Vtable {
const STATIC_VTABLE: Vtable = Vtable {
clone: static_clone,
drop: static_drop,
};
Expand Down

0 comments on commit 35b06e5

Please sign in to comment.