Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
build: [ubuntu, i686-linux, aarch64-linux, riscv64-linux]
rust: [1.78, nightly-2024-10-12]
rust: [1.78, nightly-2025-01-02]
include:
- build: ubuntu
os: ubuntu-latest
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
qemu: qemu-riscv64 -L /usr/riscv64-linux-gnu
qemu_target: riscv64-linux-user
host_target: riscv64gc-unknown-linux-gnu
- rust: nightly-2024-10-12
- rust: nightly-2025-01-02
features: nightly
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-all
# Use the unwinding crate if support for unwinding is needed. This depends on
# nightly Rust. And it's not supported on ARM yet.
[target.'cfg(not(target_arch = "arm"))'.dependencies.unwinding]
version = "0.2.4"
version = "0.2.5"
default-features = false
features = ["unwinder"]
optional = true
Expand Down
2 changes: 0 additions & 2 deletions rust-toolchain.toml

This file was deleted.

9 changes: 2 additions & 7 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@
)]
// Allow our polyfills to polyfill nightly features.
#![cfg_attr(not(feature = "nightly"), allow(unstable_name_collisions))]
// On nightly, enable strict provenance.
#![cfg_attr(feature = "nightly", feature(strict_provenance))]
#![cfg_attr(feature = "nightly", feature(exposed_provenance))]
#![cfg_attr(
feature = "nightly",
deny(fuzzy_provenance_casts, lossy_provenance_casts)
)]
// Allow `Polyfill` imports to be unused for now.
#![cfg_attr(not(feature = "nightly"), allow(unused_imports))]

#[cfg(all(feature = "alloc", not(feature = "rustc-dep-of-std")))]
extern crate alloc;
Expand Down
2 changes: 1 addition & 1 deletion src/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl<T> Polyfill<T> for *const T {

#[inline]
fn map_addr(self, f: impl FnOnce(usize) -> usize) -> *mut T {
self.with_addr(f(self.addr()))
self.with_addr(f(self.addr())).cast_mut()
}

#[inline]
Expand Down
1 change: 0 additions & 1 deletion test-crates/origin-start/src/bin/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#![no_std]
#![no_main]
#![feature(thread_local)]
#![feature(strict_provenance)]

extern crate alloc;

Expand Down
Loading