Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump msrv to 1.78 #1546

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Rust toolchain
uses: dtolnay/rust-toolchain@1.72.0
uses: dtolnay/rust-toolchain@1.78.0
- name: Get date for registry cache
id: date
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readme = "README.md"
homepage = "https://smithay.github.io/"
keywords = ["wayland", "compositor", "graphics", "server"]
categories = ["gui"]
rust-version = "1.72.0"
rust-version = "1.78.0"

[package.metadata.docs.rs]
features = ["test_all_features"]
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
msrv = "1.72.0"
msrv = "1.78.0"
type-complexity-threshold = 400

disallowed-macros = [
Expand Down
6 changes: 3 additions & 3 deletions src/wayland/shm/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ thread_local!(static SIGBUS_GUARD: Cell<(*const MemMap, bool)> = const { Cell::n

/// SAFETY:
/// This will be only set in the `SIGBUS_INIT` closure, hence only once!
static mut OLD_SIGBUS_HANDLER: Option<libc::sigaction> = None;
static mut OLD_SIGBUS_HANDLER: libc::sigaction = unsafe { mem::zeroed() };
static SIGBUS_INIT: Once = Once::new();

#[derive(Debug)]
Expand Down Expand Up @@ -313,7 +313,7 @@ unsafe fn place_sigbus_handler() {
action.sa_sigaction = sigbus_handler as _;
action.sa_flags = libc::SA_SIGINFO | libc::SA_NODEFER;

let old_action = OLD_SIGBUS_HANDLER.insert(mem::zeroed());
let old_action = std::ptr::addr_of_mut!(OLD_SIGBUS_HANDLER);
if libc::sigaction(libc::SIGBUS, &action, old_action) == -1 {
let e = rustix::io::Errno::from_raw_os_error(errno::errno().0);
panic!("sigaction failed for SIGBUS handler: {:?}", e);
Expand All @@ -326,7 +326,7 @@ unsafe fn reraise_sigbus() {
unsafe {
libc::sigaction(
libc::SIGBUS,
OLD_SIGBUS_HANDLER.as_ref().unwrap(),
std::ptr::addr_of_mut!(OLD_SIGBUS_HANDLER),
ptr::null_mut(),
);
libc::raise(libc::SIGBUS);
Expand Down
Loading