Skip to content

Commit 0de854a

Browse files
eigmaxeigmax
authored
styple: lint (#290)
* styple: lint * docs: fix type and format
1 parent ed1fa52 commit 0de854a

40 files changed

+170
-185
lines changed

‎algebraic-gpu/src/circom_circuit.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub use num_bigint::BigUint;
1414
use num_traits::Num;
1515

1616
pub fn repr_to_big<T: std::fmt::Debug>(r: T) -> String {
17-
let hex_str = format!("{:?}", r);
17+
let hex_str = format!("{r:?}");
1818
let trim_quotes = hex_str.trim_start_matches("Scalar(0x").trim_end_matches(')');
1919
let clean_hex = trim_quotes.trim_matches('"').trim_start_matches("0x");
2020
BigUint::from_str_radix(clean_hex, 16).map(|bigint: BigUint| bigint.to_str_radix(10)).unwrap()
@@ -99,10 +99,10 @@ impl<E: PrimeField> Circuit<E> for CircomCircuit<E> {
9999
let wire_mapping = &self.wire_mapping;
100100
for i in 1..self.r1cs.num_inputs {
101101
cs.alloc_input(
102-
|| format!("variable {}", i),
102+
|| format!("variable {i}"),
103103
|| {
104104
Ok(match witness {
105-
None => E::from_str_vartime(&format!("alloc input {} error", i)).unwrap(),
105+
None => E::from_str_vartime(&format!("alloc input {i} error")).unwrap(),
106106
Some(w) => match wire_mapping {
107107
None => w[i],
108108
Some(m) => w[m[i]],
@@ -148,7 +148,7 @@ impl<E: PrimeField> Circuit<E> for CircomCircuit<E> {
148148
// 0 * LC = 0 must be ignored
149149
if !((constraint.0.is_empty() || constraint.1.is_empty()) && constraint.2.is_empty()) {
150150
cs.enforce(
151-
|| format!("{}", i),
151+
|| format!("{i}"),
152152
|_| make_lc(constraint.0.clone()),
153153
|_| make_lc(constraint.1.clone()),
154154
|_| make_lc(constraint.2.clone()),

‎algebraic-gpu/src/reader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn load_witness_from_json_file<E: PrimeField>(filename: &str) -> Vec<E> {
3131
let reader = OpenOptions::new()
3232
.read(true)
3333
.open(filename)
34-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
34+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
3535
load_witness_from_json::<E, BufReader<File>>(BufReader::new(reader))
3636
}
3737

@@ -46,7 +46,7 @@ pub fn load_witness_from_bin_file<E: PrimeField>(filename: &str) -> Vec<E> {
4646
let reader = OpenOptions::new()
4747
.read(true)
4848
.open(filename)
49-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
49+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
5050
load_witness_from_bin_reader::<E, BufReader<File>>(BufReader::new(reader))
5151
.expect("read witness failed")
5252
}
@@ -135,7 +135,7 @@ fn load_r1cs_from_json_file<E: PrimeField>(filename: &str) -> R1CS<E> {
135135
let reader = OpenOptions::new()
136136
.read(true)
137137
.open(filename)
138-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
138+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
139139
load_r1cs_from_json(BufReader::new(reader))
140140
}
141141

@@ -174,7 +174,7 @@ fn load_r1cs_from_bin_file<E: PrimeField>(filename: &str) -> (R1CS<E>, Vec<usize
174174
let reader = OpenOptions::new()
175175
.read(true)
176176
.open(filename)
177-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
177+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
178178
load_r1cs_from_bin(BufReader::new(reader))
179179
}
180180

‎algebraic-gpu/src/witness/circom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl Wasm {
121121
}
122122

123123
pub(crate) fn func(&self, name: &str) -> &Function {
124-
self.0.exports.get_function(name).unwrap_or_else(|_| panic!("function {} not found", name))
124+
self.0.exports.get_function(name).unwrap_or_else(|_| panic!("function {name} not found"))
125125
}
126126

127127
pub fn new(instance: Instance) -> Self {

‎algebraic-gpu/src/witness/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn fnv(inp: &str) -> (u32, u32) {
2222

2323
pub fn load_input_for_witness(input_file: &str) -> HashMap<String, Vec<BigInt>> {
2424
let inputs_str = std::fs::read_to_string(input_file)
25-
.unwrap_or_else(|_| panic!("Unable to load {}", input_file));
25+
.unwrap_or_else(|_| panic!("Unable to load {input_file}"));
2626
let inputs: std::collections::HashMap<String, serde_json::Value> =
2727
serde_json::from_str(&inputs_str).unwrap();
2828

@@ -46,7 +46,7 @@ pub fn load_input_for_witness(input_file: &str) -> HashMap<String, Vec<BigInt>>
4646
}
4747
//Value::Array(inner) => inner.iter().cloned().map(value_to_bigint).collect(),
4848
Value::Array(inner) => flat_array(inner),
49-
_ => panic!("{:?}", value),
49+
_ => panic!("{value:?}"),
5050
};
5151

5252
(key.clone(), res)

‎algebraic-gpu/src/witness/witness_calculator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ pub fn value_to_bigint(v: Value) -> BigInt {
251251
match v {
252252
Value::String(inner) => BigInt::from_str(&inner).unwrap(),
253253
Value::Number(inner) => {
254-
BigInt::from(inner.as_u64().unwrap_or_else(|| panic!("{} not a u32", inner)))
254+
BigInt::from(inner.as_u64().unwrap_or_else(|| panic!("{inner} not a u32")))
255255
}
256-
_ => panic!("unsupported type {:?}", v),
256+
_ => panic!("unsupported type {v:?}"),
257257
}
258258
}
259259

‎algebraic/src/circom_circuit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ impl<E: Engine> Circuit<E> for CircomCircuit<E> {
9696
let wire_mapping = &self.wire_mapping;
9797
for i in 1..self.r1cs.num_inputs {
9898
cs.alloc_input(
99-
|| format!("variable {}", i),
99+
|| format!("variable {i}"),
100100
|| {
101101
Ok(match witness {
102-
None => E::Fr::from_str(&format!("alloc input {} error", i)).unwrap(),
102+
None => E::Fr::from_str(&format!("alloc input {i} error")).unwrap(),
103103
Some(w) => match wire_mapping {
104104
None => w[i],
105105
Some(m) => w[m[i]],
@@ -145,7 +145,7 @@ impl<E: Engine> Circuit<E> for CircomCircuit<E> {
145145
// 0 * LC = 0 must be ignored
146146
if !((constraint.0.is_empty() || constraint.1.is_empty()) && constraint.2.is_empty()) {
147147
cs.enforce(
148-
|| format!("{}", i),
148+
|| format!("{i}"),
149149
|_| make_lc(constraint.0.clone()),
150150
|_| make_lc(constraint.1.clone()),
151151
|_| make_lc(constraint.2.clone()),

‎algebraic/src/reader.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn get_universal_setup_file_buff_reader(setup_file_name: &str) -> Result<BufRead
2323
/// load monomial form SRS by filename
2424
pub fn load_key_monomial_form<E: Engine>(filename: &str) -> Crs<E, CrsForMonomialForm> {
2525
let mut buf_reader = get_universal_setup_file_buff_reader(filename)
26-
.unwrap_or_else(|_| panic!("read key_monomial_form file err, {}", filename));
26+
.unwrap_or_else(|_| panic!("read key_monomial_form file err, {filename}"));
2727
Crs::<E, CrsForMonomialForm>::read(&mut buf_reader).expect("read key_monomial_form err")
2828
}
2929

@@ -35,7 +35,7 @@ pub fn maybe_load_key_lagrange_form<E: Engine>(
3535
None => None,
3636
Some(filename) => {
3737
let mut buf_reader = get_universal_setup_file_buff_reader(&filename)
38-
.unwrap_or_else(|_| panic!("read key_lagrange_form file err, {}", filename));
38+
.unwrap_or_else(|_| panic!("read key_lagrange_form file err, {filename}"));
3939
let key_lagrange_form = Crs::<E, CrsForLagrangeForm>::read(&mut buf_reader)
4040
.expect("read key_lagrange_form err");
4141
Some(key_lagrange_form)
@@ -57,7 +57,7 @@ pub fn load_witness_from_json_file<E: ScalarEngine>(filename: &str) -> Vec<E::Fr
5757
let reader = OpenOptions::new()
5858
.read(true)
5959
.open(filename)
60-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
60+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
6161
load_witness_from_json::<E, BufReader<File>>(BufReader::new(reader))
6262
}
6363

@@ -72,7 +72,7 @@ pub fn load_witness_from_bin_file<E: ScalarEngine>(filename: &str) -> Vec<E::Fr>
7272
let reader = OpenOptions::new()
7373
.read(true)
7474
.open(filename)
75-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
75+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
7676
load_witness_from_bin_reader::<E, BufReader<File>>(BufReader::new(reader))
7777
.expect("read witness failed")
7878
}
@@ -151,7 +151,7 @@ fn load_r1cs_from_json_file<E: ScalarEngine>(filename: &str) -> R1CS<E> {
151151
let reader = OpenOptions::new()
152152
.read(true)
153153
.open(filename)
154-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
154+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
155155
load_r1cs_from_json(BufReader::new(reader))
156156
}
157157

@@ -190,7 +190,7 @@ fn load_r1cs_from_bin_file<E: ScalarEngine>(filename: &str) -> (R1CS<E>, Vec<usi
190190
let reader = OpenOptions::new()
191191
.read(true)
192192
.open(filename)
193-
.unwrap_or_else(|_| panic!("Unable to open {}.", filename));
193+
.unwrap_or_else(|_| panic!("Unable to open {filename}."));
194194
load_r1cs_from_bin(BufReader::new(reader))
195195
}
196196

‎algebraic/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub use franklin_crypto::plonk::circuit::bigint::bigint::{biguint_to_fe, fe_to_b
99

1010
/// convert a hex integer representation ("0x...") to decimal representation
1111
pub fn repr_to_big<T: Display>(r: T) -> String {
12-
BigUint::from_str_radix(&format!("{}", r)[2..], 16).unwrap().to_str_radix(10)
12+
BigUint::from_str_radix(&format!("{r}")[2..], 16).unwrap().to_str_radix(10)
1313
}
1414

1515
fn from_single_size_limb_witnesses<E: Engine, F: PrimeField>(

‎algebraic/src/witness/circom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl Wasm {
121121
}
122122

123123
pub(crate) fn func(&self, name: &str) -> &Function {
124-
self.0.exports.get_function(name).unwrap_or_else(|_| panic!("function {} not found", name))
124+
self.0.exports.get_function(name).unwrap_or_else(|_| panic!("function {name} not found"))
125125
}
126126

127127
pub fn new(instance: Instance) -> Self {

‎algebraic/src/witness/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn fnv(inp: &str) -> (u32, u32) {
2222

2323
pub fn load_input_for_witness(input_file: &str) -> HashMap<String, Vec<BigInt>> {
2424
let inputs_str = std::fs::read_to_string(input_file)
25-
.unwrap_or_else(|_| panic!("Unable to load {}", input_file));
25+
.unwrap_or_else(|_| panic!("Unable to load {input_file}"));
2626
let inputs: std::collections::HashMap<String, serde_json::Value> =
2727
serde_json::from_str(&inputs_str).unwrap();
2828

@@ -46,7 +46,7 @@ pub fn load_input_for_witness(input_file: &str) -> HashMap<String, Vec<BigInt>>
4646
}
4747
//Value::Array(inner) => inner.iter().cloned().map(value_to_bigint).collect(),
4848
Value::Array(inner) => flat_array(inner),
49-
_ => panic!("{:?}", value),
49+
_ => panic!("{value:?}"),
5050
};
5151

5252
(key.clone(), res)

0 commit comments

Comments
 (0)