Skip to content

Commit a907aab

Browse files
authored
Remove nightly features (#24)
1 parent 812b196 commit a907aab

12 files changed

Lines changed: 37 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v3
5050
- uses: actions-rs/toolchain@v1
51+
with:
52+
profile: minimal
53+
toolchain: stable
54+
override: true
5155
# use the more efficient nextest
5256
- uses: taiki-e/install-action@nextest
5357
- uses: Swatinem/rust-cache@v2
@@ -70,8 +74,12 @@ jobs:
7074
steps:
7175
- uses: actions/checkout@v2
7276
- uses: actions-rs/toolchain@v1
77+
with:
78+
profile: minimal
79+
toolchain: stable
80+
components: rustfmt
81+
override: true
7382
- uses: Swatinem/rust-cache@v2
74-
- run: rustup component add rustfmt
7583
- uses: actions-rs/cargo@v1
7684
with:
7785
command: fmt
@@ -85,6 +93,9 @@ jobs:
8593
- uses: actions/checkout@v2
8694
- uses: actions-rs/toolchain@v1
8795
with:
96+
profile: minimal
97+
toolchain: stable
98+
override: true
8899
components: clippy
89100
- uses: Swatinem/rust-cache@v2
90101
- name: Run clippy

.github/workflows/linter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions-rs/toolchain@v1
1717
with:
18+
profile: minimal
19+
toolchain: stable
1820
components: rustfmt, clippy
1921
override: true
2022

.github/workflows/typos.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[default.extend-words]
22
nd = "nd"
3-
hax = "hax"
3+
hax = "hax"

crates/linear_algebra/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![cfg_attr(not(feature = "std"), no_std)]
2-
#![feature(trait_alias)]
32
#![allow(incomplete_features)]
4-
#![feature(inherent_associated_types)]
53

64
#[macro_use]
75
extern crate ark_std;

crates/ring/src/cyclotomic_ring/crt.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::utils::into_raw_parts;
12
use ark_std::{ptr, slice, vec::*};
23

34
/// Enables Chinese Remainder Transform (CRT) conversion from coefficient
@@ -7,7 +8,7 @@ pub trait CRT: Sized {
78

89
fn crt(self) -> Self::CRTForm;
910
fn elementwise_crt(vec: Vec<Self>) -> Vec<Self::CRTForm> {
10-
let (ptr, len, cap) = vec.into_raw_parts();
11+
let (ptr, len, cap) = into_raw_parts(vec);
1112

1213
let slice = unsafe { slice::from_raw_parts_mut(ptr, len) };
1314

@@ -31,7 +32,7 @@ pub trait ICRT: Sized {
3132

3233
fn icrt(self) -> Self::ICRTForm;
3334
fn elementwise_icrt(vec: Vec<Self>) -> Vec<Self::ICRTForm> {
34-
let (ptr, len, cap) = vec.into_raw_parts();
35+
let (ptr, len, cap) = into_raw_parts(vec);
3536

3637
let slice = unsafe { slice::from_raw_parts_mut(ptr, len) };
3738

crates/ring/src/cyclotomic_ring/flatten.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! This module introduces a function `flatten_to_coeffs` on vectors of
33
//! cyclotomic ring elements to cheaply cast them into vectors of corresponding
44
//! base field coefficients and its "inverse" `promote_from_coeffs`.
5-
use crate::PolyRing;
5+
use crate::{utils::into_raw_parts, PolyRing};
66
use ark_std::vec::*;
77

88
use super::{CyclotomicConfig, CyclotomicPolyRingGeneral, CyclotomicPolyRingNTTGeneral};
@@ -11,7 +11,7 @@ pub trait Flatten: PolyRing {
1111
fn flatten_to_coeffs(vec: Vec<Self>) -> Vec<Self::BaseRing> {
1212
let dimension = Self::dimension();
1313

14-
let (ptr, len, cap) = vec.into_raw_parts();
14+
let (ptr, len, cap) = into_raw_parts(vec);
1515

1616
unsafe { Vec::from_raw_parts(ptr as *mut Self::BaseRing, len * dimension, cap * dimension) }
1717
}
@@ -27,7 +27,7 @@ pub trait Flatten: PolyRing {
2727
vec.shrink_to_fit();
2828
}
2929

30-
let (ptr, len, cap) = vec.into_raw_parts();
30+
let (ptr, len, cap) = into_raw_parts(vec);
3131

3232
Some(unsafe { Vec::from_raw_parts(ptr as *mut Self, len / dimension, cap / dimension) })
3333
}

crates/ring/src/cyclotomic_ring/models/babybear/fq9.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use ark_ff::{CubicExtConfig, CubicExtField, Fp3, Fp3Config, SqrtPrecomputation};
22
use ark_std::{marker::PhantomData, vec::*};
33

44
use super::{BabyBear3ExtConfig, Fq, Fq9};
5+
use crate::utils::into_raw_parts;
56

67
pub trait Fp9Config: 'static + Send + Sync + Sized {
78
type Fp3Config: Fp3Config;
@@ -60,7 +61,7 @@ pub type Fp9<P> = CubicExtField<Fp9ConfigWrapper<P>>;
6061
pub(super) fn fq_vec_to_fq9_vec(mut vec: Vec<Fq>) -> Vec<Fq9> {
6162
vec.shrink_to_fit();
6263

63-
let (ptr, len, cap) = vec.into_raw_parts();
64+
let (ptr, len, cap) = into_raw_parts(vec);
6465

6566
assert_eq!(len, cap);
6667

@@ -70,7 +71,7 @@ pub(super) fn fq_vec_to_fq9_vec(mut vec: Vec<Fq>) -> Vec<Fq9> {
7071
pub(super) fn fq9_vec_to_fq_vec(mut vec: Vec<Fq9>) -> Vec<Fq> {
7172
vec.shrink_to_fit();
7273

73-
let (ptr, len, cap) = vec.into_raw_parts();
74+
let (ptr, len, cap) = into_raw_parts(vec);
7475

7576
assert_eq!(len, cap);
7677

crates/ring/src/cyclotomic_ring/models/frog_ring/utils.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
use super::{Fq, Fq4};
2+
use crate::utils::into_raw_parts;
23
use ark_std::vec::*;
34

45
pub(super) fn fq_vec_to_fq4_vec(mut vec: Vec<Fq>) -> Vec<Fq4> {
56
vec.shrink_to_fit();
67

7-
let (ptr, len, cap) = vec.into_raw_parts();
8+
let (ptr, len, cap) = into_raw_parts(vec);
89

910
assert_eq!(len, cap);
1011

@@ -14,7 +15,7 @@ pub(super) fn fq_vec_to_fq4_vec(mut vec: Vec<Fq>) -> Vec<Fq4> {
1415
pub(super) fn fq4_vec_to_fq_vec(mut vec: Vec<Fq4>) -> Vec<Fq> {
1516
vec.shrink_to_fit();
1617

17-
let (ptr, len, cap) = vec.into_raw_parts();
18+
let (ptr, len, cap) = into_raw_parts(vec);
1819

1920
assert_eq!(len, cap);
2021

crates/ring/src/cyclotomic_ring/models/goldilocks/utils.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
use super::{Fq, Fq3};
2+
use crate::utils::into_raw_parts;
23
use ark_std::vec::*;
34

45
pub(super) fn fq_vec_to_fq3_vec(mut vec: Vec<Fq>) -> Vec<Fq3> {
56
vec.shrink_to_fit();
67

7-
let (ptr, len, cap) = vec.into_raw_parts();
8+
let (ptr, len, cap) = into_raw_parts(vec);
89

910
assert_eq!(len, cap);
1011

@@ -14,7 +15,7 @@ pub(super) fn fq_vec_to_fq3_vec(mut vec: Vec<Fq>) -> Vec<Fq3> {
1415
pub(super) fn fq3_vec_to_fq_vec(mut vec: Vec<Fq3>) -> Vec<Fq> {
1516
vec.shrink_to_fit();
1617

17-
let (ptr, len, cap) = vec.into_raw_parts();
18+
let (ptr, len, cap) = into_raw_parts(vec);
1819

1920
assert_eq!(len, cap);
2021

crates/ring/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![cfg_attr(not(feature = "std"), no_std)]
22
#![allow(non_snake_case)]
3-
#![feature(vec_into_raw_parts)]
43
// Exports
54
pub use balanced_decomposition::{
65
representatives::{SignedRepresentative, UnsignedRepresentative},
@@ -20,6 +19,7 @@ mod error;
2019
mod monomial;
2120
mod poly_ring;
2221
mod ring;
22+
pub(crate) mod utils;
2323

2424
#[macro_use]
2525
extern crate ark_std;

0 commit comments

Comments
 (0)