Skip to content

Commit 98dc48e

Browse files
committed
(momo) Upgrade and cleanup of unused nightly features
1 parent 7a8d6d8 commit 98dc48e

File tree

14 files changed

+12
-25
lines changed

14 files changed

+12
-25
lines changed

Cargo.lock

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

necsim/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![feature(const_mut_refs)]
77
#![feature(const_fn_trait_bound)]
88
#![feature(const_refs_to_cell)]
9-
#![allow(incomplete_features)]
109
#![feature(generic_associated_types)]
1110

1211
#[doc(hidden)]

necsim/impls/cuda/src/cogs/maths.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl MathsCore for NvptxMathsCore {
3131
let x: f32 = x as f32;
3232
let f: f32;
3333

34-
asm!("lg2.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
34+
core::arch::asm!("lg2.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
3535

3636
// f / log_2(e)
3737
f64::from(f) * FRAC_1_LOG2_E
@@ -50,7 +50,7 @@ impl MathsCore for NvptxMathsCore {
5050
let x: f32 = (x * core::f64::consts::LOG2_E) as f32;
5151
let f: f32;
5252

53-
asm!("ex2.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
53+
core::arch::asm!("ex2.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
5454

5555
f64::from(f)
5656
}
@@ -73,7 +73,7 @@ impl MathsCore for NvptxMathsCore {
7373
let x: f32 = x as f32;
7474
let f: f32;
7575

76-
asm!("sin.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
76+
core::arch::asm!("sin.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
7777

7878
f64::from(f)
7979
}
@@ -91,7 +91,7 @@ impl MathsCore for NvptxMathsCore {
9191
let x: f32 = x as f32;
9292
let f: f32;
9393

94-
asm!("cos.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
94+
core::arch::asm!("cos.approx.f32 {}, {};", out(reg32) f, in(reg32) x, options(pure, nomem, nostack));
9595

9696
f64::from(f)
9797
}
@@ -108,12 +108,12 @@ impl MathsCore for NvptxMathsCore {
108108
const ROUND_TRUNC_OFFSET: f64 = 0.5_f64 - 0.25_f64 * f64::EPSILON;
109109

110110
let offset: f64;
111-
asm!("copysign {}, {}, {};", out(reg64) offset, in(reg64) x, const ROUND_TRUNC_OFFSET.to_bits(), options(pure, nomem, nostack));
111+
core::arch::asm!("copysign {}, {}, {};", out(reg64) offset, in(reg64) x, const ROUND_TRUNC_OFFSET.to_bits(), options(pure, nomem, nostack));
112112

113113
let overshot = x + offset;
114114

115115
let round: f64;
116-
asm!("cvt.rzi.f64.f64 {}, {};", out(reg64) round, in(reg64) overshot, options(pure, nomem, nostack));
116+
core::arch::asm!("cvt.rzi.f64.f64 {}, {};", out(reg64) round, in(reg64) overshot, options(pure, nomem, nostack));
117117

118118
round
119119
}

necsim/impls/cuda/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#![feature(const_mut_refs)]
99
#![feature(const_fn_trait_bound)]
1010
#![feature(const_refs_to_cell)]
11-
#![cfg_attr(target_os = "cuda", feature(asm))]
1211
#![cfg_attr(target_os = "cuda", feature(asm_experimental_arch))]
1312
#![cfg_attr(target_os = "cuda", feature(asm_const))]
1413
#![cfg_attr(target_os = "cuda", feature(const_float_bits_conv))]

necsim/impls/no-std/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![deny(clippy::pedantic)]
22
#![no_std]
3-
#![feature(total_cmp)]
43
#![feature(iter_advance_by)]
54
#![feature(drain_filter)]
65
#![feature(type_alias_impl_trait)]
@@ -10,8 +9,8 @@
109
#![feature(const_mut_refs)]
1110
#![feature(const_fn_trait_bound)]
1211
#![feature(const_refs_to_cell)]
13-
#![allow(incomplete_features)]
1412
#![feature(generic_associated_types)]
13+
#![allow(incomplete_features)]
1514
#![feature(specialization)]
1615

1716
extern crate alloc;

necsim/partitioning/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![deny(clippy::pedantic)]
22
#![no_std]
3-
#![allow(incomplete_features)]
43
#![feature(generic_associated_types)]
54

65
extern crate alloc;

necsim/partitioning/monolithic/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![deny(clippy::pedantic)]
2-
#![allow(incomplete_features)]
32
#![feature(generic_associated_types)]
43

54
#[macro_use]

necsim/partitioning/mpi/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![deny(clippy::pedantic)]
2-
#![allow(incomplete_features)]
32
#![feature(generic_associated_types)]
4-
#![feature(stmt_expr_attributes)]
53

64
#[macro_use]
75
extern crate contracts;

necsim/partitioning/mpi/src/partition/root.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl<R: Reporter> Reporter for MpiRootPartition<R> {
433433
let remaining_status: (u64, _) = msg.matched_receive();
434434

435435
#[allow(clippy::cast_sign_loss)]
436-
self.all_remaining[remaining_status.1.source_rank() as usize] = remaining_status.0;
436+
{ self.all_remaining[remaining_status.1.source_rank() as usize] = remaining_status.0; }
437437
}
438438

439439
self.reporter.report_progress(

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2021-12-15"
2+
channel = "nightly-2021-12-16"
33
components = [ "cargo", "rustfmt", "clippy", "rust-src" ]
44
targets = [ "x86_64-unknown-linux-gnu", "nvptx64-nvidia-cuda" ]

0 commit comments

Comments
 (0)