Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit eff5a90

Browse files
JarvisCraftJarvisCraft
committed
style(classfile): reformat sources after updating internal test tools
1 parent 53be0c5 commit eff5a90

File tree

6 files changed

+48
-44
lines changed

6 files changed

+48
-44
lines changed

‎javac-rs-classfile/src/bytecode.rs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,11 +1022,8 @@ impl Bytecode {
10221022
dimensions: NonZeroU8,
10231023
) -> Result<BytecodeOffset, BytecodeUpdateError> {
10241024
let dimensions = dimensions.get();
1025-
self.stack_update(dimensions as u16, 1).and(self.push_instr_ops_2(
1026-
0x19,
1027-
&component_type.to_be_bytes(),
1028-
&[dimensions],
1029-
))
1025+
self.stack_update(dimensions as u16, 1)
1026+
.and(self.push_instr_ops_2(0x19, &component_type.to_be_bytes(), &[dimensions]))
10301027
}
10311028

10321029
pub fn instr_new(
@@ -1055,7 +1052,7 @@ impl Bytecode {
10551052
}
10561053
};
10571054
self.stack_update(0, 1)
1058-
.and(self.push_instr_ops(0xbc,&[component_type]))
1055+
.and(self.push_instr_ops(0xbc, &[component_type]))
10591056
}
10601057

10611058
pub fn instr_nop(&mut self) -> Result<BytecodeOffset, BytecodeUpdateError> {
@@ -1075,8 +1072,7 @@ impl Bytecode {
10751072
field: ConstPoolIndex<ConstFieldRefInfo>,
10761073
fat: bool,
10771074
) -> Result<BytecodeOffset, BytecodeUpdateError> {
1078-
self
1079-
.stack_update(1 + Self::slot_size(fat), 0)
1075+
self.stack_update(1 + Self::slot_size(fat), 0)
10801076
.and(self.push_instr_ops(0xb5, &field.as_bytes()))
10811077
}
10821078

@@ -1085,8 +1081,7 @@ impl Bytecode {
10851081
field: ConstPoolIndex<ConstFieldRefInfo>,
10861082
fat: bool,
10871083
) -> Result<BytecodeOffset, BytecodeUpdateError> {
1088-
self
1089-
.stack_update(Self::slot_size(fat), 0)
1084+
self.stack_update(Self::slot_size(fat), 0)
10901085
.and(self.push_instr_ops(0xb3, &field.as_bytes()))
10911086
}
10921087

‎javac-rs-classfile/src/constpool.rs‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ impl ConstPool {
194194
///
195195
/// * `index` - index at which to try to get the entry
196196
fn entry_at<T: ConstPoolEntryInfo>(&self, index: ConstPoolIndex<T>) -> Option<&ConstPoolEntry> {
197-
self.entries.get(index.0.0)
197+
self.entries.get(index.0 .0)
198198
}
199199

200200
/// Gets the size of this const pool as `u16` which corresponds to its VM-type.
@@ -936,13 +936,25 @@ mod tests {
936936
fn test_const_pool_insert_balancing() {
937937
let mut const_pool = ConstPool::new();
938938
assert_eq!(
939-
const_pool.store_entry_info(ConstIntegerInfo { value: 123 }).unwrap().as_u16(), 1u16
939+
const_pool
940+
.store_entry_info(ConstIntegerInfo { value: 123 })
941+
.unwrap()
942+
.as_u16(),
943+
1u16
940944
);
941945
assert_eq!(
942-
const_pool.store_entry_info(ConstIntegerInfo { value: 123 }).unwrap().as_u16(), 1u16
946+
const_pool
947+
.store_entry_info(ConstIntegerInfo { value: 123 })
948+
.unwrap()
949+
.as_u16(),
950+
1u16
943951
);
944952
assert_eq!(
945-
const_pool.store_entry_info(ConstIntegerInfo { value: 456 }).unwrap().as_u16(), 2u16
953+
const_pool
954+
.store_entry_info(ConstIntegerInfo { value: 456 })
955+
.unwrap()
956+
.as_u16(),
957+
2u16
946958
);
947959
}
948960
}

‎javac-rs-classfile/tests/class_testing.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl ClassTester {
2020
Ok(Command::new("java").arg(&self.class_name).output()?)
2121
}
2222

23-
pub fn run_with_args<I: IntoIterator<Item=S>, S: AsRef<OsStr>>(
23+
pub fn run_with_args<I: IntoIterator<Item = S>, S: AsRef<OsStr>>(
2424
&self,
2525
args: I,
2626
) -> io::Result<Output> {
@@ -34,7 +34,7 @@ impl ClassTester {
3434
Command::new("javap").arg(&self.class_name).output()
3535
}
3636

37-
pub fn disasm_with_args<I: IntoIterator<Item=S>, S: AsRef<OsStr>>(
37+
pub fn disasm_with_args<I: IntoIterator<Item = S>, S: AsRef<OsStr>>(
3838
&self,
3939
args: I,
4040
) -> io::Result<Output> {

‎javac-rs-classfile/tests/class_with_attributes.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ fn class_file_with_source_file_attribute() {
2424
class,
2525
"ru.progrm_jarvis.javacrs.TestClassWithSourceFileAttribute".to_string(),
2626
)
27-
.unwrap()
28-
.assert_disasmable();
27+
.unwrap()
28+
.assert_disasmable();
2929
}
3030

3131
#[test]
@@ -43,8 +43,8 @@ fn class_file_with_synthetic_attribute() {
4343
class,
4444
"ru.progrm_jarvis.javacrs.TestClassWithSyntheticAttribute".to_string(),
4545
)
46-
.unwrap()
47-
.assert_disasmable();
46+
.unwrap()
47+
.assert_disasmable();
4848
}
4949

5050
#[test]
@@ -62,8 +62,8 @@ fn class_file_with_deprecated_attribute() {
6262
class,
6363
"ru.progrm_jarvis.javacrs.TestClassWithDeprecatedAttribute".to_string(),
6464
)
65-
.unwrap()
66-
.assert_disasmable();
65+
.unwrap()
66+
.assert_disasmable();
6767
}
6868

6969
#[test]
@@ -83,8 +83,8 @@ fn class_file_with_signature_attribute() {
8383
class,
8484
"ru.progrm_jarvis.javacrs.TestClassWithSignatureAttribute".to_string(),
8585
)
86-
.unwrap()
87-
.assert_disasmable();
86+
.unwrap()
87+
.assert_disasmable();
8888
}
8989

9090
#[test]
@@ -107,8 +107,8 @@ fn class_file_with_single_custom_attribute() {
107107
class,
108108
"ru.progrm_jarvis.javacrs.TestClassWithSingleCustomAttribute".to_string(),
109109
)
110-
.unwrap()
111-
.assert_disasmable();
110+
.unwrap()
111+
.assert_disasmable();
112112
}
113113

114114
#[test]
@@ -137,6 +137,6 @@ fn class_file_with_multiple_custom_attributes() {
137137
class,
138138
"ru.progrm_jarvis.javacrs.TestClassWithMultipleCustomAttributes".to_string(),
139139
)
140-
.unwrap()
141-
.assert_disasmable();
140+
.unwrap()
141+
.assert_disasmable();
142142
}

‎javac-rs-classfile/tests/class_with_fields.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::convert::TryFrom;
22
use std::fs::File;
33

44
use javac_rs_classfile::{
5-
Class, ClassAccessFlag, ClassfileVersion, ClassfileWritable, ConstValue, FieldAccessFlag,
6-
FieldDescriptor, JvmVecU4, major_versions,
5+
major_versions, Class, ClassAccessFlag, ClassfileVersion, ClassfileWritable, ConstValue,
6+
FieldAccessFlag, FieldDescriptor, JvmVecU4,
77
};
88

99
mod class_testing;
@@ -32,8 +32,8 @@ fn class_file_with_field_without_attributes() {
3232
class,
3333
"ru.progrm_jarvis.javacrs.TestClassWithFieldWithoutAttributes".to_string(),
3434
)
35-
.unwrap()
36-
.assert_disasmable();
35+
.unwrap()
36+
.assert_disasmable();
3737
}
3838

3939
#[test]
@@ -63,8 +63,8 @@ fn class_file_with_field_with_const_value_attribute() {
6363
class,
6464
"ru.progrm_jarvis.javacrs.TestClassWithConstValueAttribute".to_string(),
6565
)
66-
.unwrap()
67-
.assert_disasmable();
66+
.unwrap()
67+
.assert_disasmable();
6868
}
6969

7070
#[test]
@@ -110,6 +110,6 @@ fn class_file_with_field_with_various_attributes() {
110110
class,
111111
"ru.progrm_jarvis.javacrs.TestClassWithVariousAttributes".to_string(),
112112
)
113-
.unwrap()
114-
.assert_disasmable();
113+
.unwrap()
114+
.assert_disasmable();
115115
}

‎javac-rs-classfile/tests/simple_class.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ fn class_file() {
1313
String::from("java/lang/Object"),
1414
);
1515

16-
class_testing::dump_class(
17-
class,
18-
"ru.progrm_jarvis.javacrs.TestClass".to_string(),
19-
)
16+
class_testing::dump_class(class, "ru.progrm_jarvis.javacrs.TestClass".to_string())
2017
.unwrap()
2118
.assert_disasmable();
2219
}
@@ -36,8 +33,8 @@ fn class_file_with_single_interface() {
3633
class,
3734
"ru.progrm_jarvis.javacrs.TestClassWithSingleInterface".to_string(),
3835
)
39-
.unwrap()
40-
.assert_disasmable();
36+
.unwrap()
37+
.assert_disasmable();
4138
}
4239

4340
#[test]
@@ -56,6 +53,6 @@ fn class_file_with_multiple_interface() {
5653
class,
5754
"ru.progrm_jarvis.javacrs.TestClassWithMultipleInterfaces".to_string(),
5855
)
59-
.unwrap()
60-
.assert_disasmable();
56+
.unwrap()
57+
.assert_disasmable();
6158
}

0 commit comments

Comments
 (0)