Skip to content

Commit 6c31ad6

Browse files
committed
Upgrade MSRV to 1.79-nightly + update dependencies
1 parent cea74d7 commit 6c31ad6

File tree

45 files changed

+914
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+914
-459
lines changed

Cargo.lock

Lines changed: 330 additions & 332 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

necsim/core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ cuda = ["rust-cuda"]
1515
necsim-core-maths = { path = "maths" }
1616
necsim-core-bond = { path = "bond" }
1717

18-
const-type-layout = { version = "0.2.0", features = ["derive"] }
18+
const-type-layout = { version = "0.3.0", features = ["derive"] }
1919
contracts = "0.6.3"
2020
serde = { version = "1.0", default-features = false, features = ["derive"] }
2121

2222
[target.'cfg(target_os = "cuda")'.dependencies]
23-
rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "6b53e88", features = ["derive"], optional = true }
23+
rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "f395253", features = ["derive"], optional = true }
2424

2525
[target.'cfg(not(target_os = "cuda"))'.dependencies]
26-
rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "6b53e88", features = ["derive", "host"], optional = true }
26+
rust-cuda = { git = "https://github.com/juntyr/rust-cuda", rev = "f395253", features = ["derive", "host"], optional = true }

necsim/core/bond/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ default = []
1313
[dependencies]
1414
necsim-core-maths = { path = "../maths" }
1515

16-
const-type-layout = { version = "0.2.0", features = ["derive"] }
16+
const-type-layout = { version = "0.3.0", features = ["derive"] }
1717
serde = { version = "1.0", default-features = false, features = ["derive"] }

necsim/core/bond/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(const_float_bits_conv)]
55
#![feature(const_float_classify)]
66
#![feature(const_type_name)]
7-
#![feature(offset_of)]
87

98
#[macro_use]
109
extern crate const_type_layout;

necsim/core/maths/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#![deny(clippy::pedantic)]
22
#![no_std]
3+
#![allow(internal_features)]
34
#![feature(core_intrinsics)]
45

56
pub trait MathsCore: 'static + Clone + core::fmt::Debug {

necsim/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![deny(clippy::pedantic)]
22
#![no_std]
33
#![feature(const_type_name)]
4-
#![feature(offset_of)]
54
#![feature(control_flow_enum)]
65
#![feature(min_specialization)]
76

necsim/core/src/reporter/null.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use core::u64;
2-
31
use crate::{impl_report, reporter::Reporter};
42

53
#[allow(clippy::module_name_repetitions)]

necsim/core/src/reporter/used.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub type Ignored<T> = MaybeUsed<T, False>;
1414

1515
impl<'a, T, B: Boolean> From<&'a T> for &'a MaybeUsed<T, B> {
1616
fn from(inner: &'a T) -> Self {
17-
unsafe { &*(inner as *const T).cast() }
17+
unsafe { &*core::ptr::from_ref(inner).cast() }
1818
}
1919
}
2020

necsim/core/src/simulation/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl<
173173
// This is only safe as PartialSimulation's type and layout is a prefix
174174
// subsequence of Self's type and layout
175175
let partial_simulation = unsafe {
176-
&mut *(self as *mut Self)
176+
&mut *core::ptr::from_mut(self)
177177
.cast::<super::partial::active_lineage_sampler::PartialSimulation<
178178
M,
179179
H,
@@ -213,7 +213,7 @@ impl<
213213
// This is only safe as PartialSimulation's type and layout is a prefix
214214
// subsequence of Self's type and layout
215215
let partial_simulation = unsafe {
216-
&mut *(self as *mut Self).cast::<super::partial::event_sampler::PartialSimulation<
216+
&mut *core::ptr::from_mut(self).cast::<super::partial::event_sampler::PartialSimulation<
217217
M,
218218
H,
219219
G,

necsim/core/src/simulation/partial/active_lineage_sampler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<
5656
// This is only safe as PartialSimulation's type and layout is a prefix
5757
// subsequence of Self's type and layout
5858
let partial_simulation = unsafe {
59-
&*(self as *const Self).cast::<super::event_sampler::PartialSimulation<
59+
&*core::ptr::from_ref(self).cast::<super::event_sampler::PartialSimulation<
6060
M,
6161
H,
6262
G,
@@ -87,7 +87,7 @@ impl<
8787
// This is only safe as PartialSimulation's type and layout is a prefix
8888
// subsequence of Self's type and layout
8989
let partial_simulation = unsafe {
90-
&mut *(self as *mut Self).cast::<super::event_sampler::PartialSimulation<
90+
&mut *core::ptr::from_mut(self).cast::<super::event_sampler::PartialSimulation<
9191
M,
9292
H,
9393
G,

0 commit comments

Comments
 (0)