Skip to content

Commit

Permalink
Merge remote-tracking branch 'tarcieri/restore-1.60-msrv' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
isislovecruft committed Jun 24, 2024
2 parents 6dcd695 + 1fa4054 commit f1f8e53
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- stable
- beta
- nightly
- 1.41.0
- 1.60.0
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ impl Not for Choice {
/// Note: Rust's notion of "volatile" is subject to change over time. While this
/// code may break in a non-destructive way in the future, “constant-time” code
/// is a continually moving target, and this is better than doing nothing.
#[cfg(not(feature = "core_hint_black_box"))]
#[inline(never)]
fn black_box<T: Copy>(input: T) -> T {
unsafe {
Expand Down Expand Up @@ -996,7 +997,7 @@ impl<T: Copy> BlackBox<T> {
/// Constructs a new instance of `BlackBox` which will wrap the specified value.
///
/// All access to the inner value will be mediated by a `black_box` optimization barrier.
pub const fn new(value: T) -> Self {
pub fn new(value: T) -> Self {
Self(value)
}

Expand Down

0 comments on commit f1f8e53

Please sign in to comment.