Skip to content

Commit ddad2bb

Browse files
emesareemesare
committed
More rust cleanup
- Make EdgeStyle type not wrap raw - Regression tests for WARP will run on all bins in the out dir now
1 parent ef2c40b commit ddad2bb

16 files changed

+1160
-147
lines changed

‎plugins/dwarf/dwarfdump/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ fn process_tree<R: Reader>(
260260
graph_parent.add_outgoing_edge(
261261
BranchType::UnconditionalBranch,
262262
&new_node,
263-
&EdgeStyle::default(),
263+
EdgeStyle::default(),
264264
);
265265

266266
let mut children = die_node.children();

‎plugins/warp/src/convert.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ mod tests {
606606
}
607607
}
608608
}
609-
609+
610610
#[ignore]
611611
#[test]
612612
fn check_for_leaks() {

‎plugins/warp/src/lib.rs‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,16 @@ mod tests {
204204
let entry = entry.expect("Failed to read directory entry");
205205
let path = entry.path();
206206
if path.is_file() {
207-
if let Some(path_str) = path.to_str() {
208-
if path_str.ends_with("library.o") {
209-
if let Some(inital_bv) = session.load(path_str) {
210-
let mut functions = inital_bv
211-
.functions()
212-
.iter()
213-
.map(|f| cached_function_guid(&f, &f.low_level_il().unwrap()))
214-
.collect::<Vec<_>>();
215-
functions.sort_by_key(|guid| guid.guid);
216-
insta::assert_debug_snapshot!(functions);
217-
}
218-
}
219-
}
207+
let view = session.load(&path).expect("Failed to load view");
208+
let mut functions = view
209+
.functions()
210+
.iter()
211+
.map(|f| cached_function_guid(&f, &f.low_level_il().unwrap()))
212+
.collect::<Vec<_>>();
213+
functions.sort_by_key(|guid| guid.guid);
214+
let snapshot_name =
215+
format!("snapshot_{}", path.file_stem().unwrap().to_string_lossy());
216+
insta::assert_debug_snapshot!(snapshot_name, functions);
220217
}
221218
}
222219
}

‎plugins/warp/src/snapshots/warp_ninja__tests__insta_signatures.snap‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎plugins/warp/src/snapshots/warp_ninja__tests__insta_signatures.snap.new‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎plugins/warp/src/snapshots/warp_ninja__tests__snapshot__ctype.snap‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
---
2+
source: plugins/warp/src/lib.rs
3+
expression: functions
4+
---
5+
[
6+
FunctionGUID {
7+
guid: 00c71b63-3039-5aa3-94f7-1737530239d9,
8+
},
9+
FunctionGUID {
10+
guid: 06ff982d-b167-5dce-9689-71a631820da6,
11+
},
12+
FunctionGUID {
13+
guid: 0d6d3685-7a8a-5d1c-8b7a-fe14871218ff,
14+
},
15+
FunctionGUID {
16+
guid: 0df54a49-5267-52f7-9665-70a8e66ad0dd,
17+
},
18+
FunctionGUID {
19+
guid: 13b16f81-0c6f-5aee-ad9f-0d142658cf18,
20+
},
21+
FunctionGUID {
22+
guid: 15d686e8-3e80-5632-9ce7-17c3510f8238,
23+
},
24+
FunctionGUID {
25+
guid: 18cfce71-47bc-5595-89cb-06e0563b211d,
26+
},
27+
FunctionGUID {
28+
guid: 1b6aa5a3-ac7f-542d-a0ab-bae8f142d8d8,
29+
},
30+
FunctionGUID {
31+
guid: 1e794537-6289-59e7-bef9-0c72f3989db8,
32+
},
33+
FunctionGUID {
34+
guid: 29690354-fa27-54d1-a8be-18535b19b1c3,
35+
},
36+
FunctionGUID {
37+
guid: 33e6bc5f-eeb6-5a07-810e-f04a2dba36cf,
38+
},
39+
FunctionGUID {
40+
guid: 3b992cd7-1721-5f30-b59c-84ea682be808,
41+
},
42+
FunctionGUID {
43+
guid: 3ba4d0cb-9c07-5904-aafe-34e051b89be5,
44+
},
45+
FunctionGUID {
46+
guid: 3cc2e827-b707-5c9d-82e9-d76ac3abc904,
47+
},
48+
FunctionGUID {
49+
guid: 43a8c54b-dd4f-5334-ae00-218cb758ad4c,
50+
},
51+
FunctionGUID {
52+
guid: 53b484f3-751a-505d-beae-acc9d69c261d,
53+
},
54+
FunctionGUID {
55+
guid: 5b7cc78f-3b2f-5b82-9726-37c26ad087b4,
56+
},
57+
FunctionGUID {
58+
guid: 5b7f41e9-de1e-558c-ac7d-888acca3a76c,
59+
},
60+
FunctionGUID {
61+
guid: 6abe3fc2-6d29-5fde-a31e-bb8249db6bf9,
62+
},
63+
FunctionGUID {
64+
guid: 6db530d1-8ea4-568e-a089-c61164851f04,
65+
},
66+
FunctionGUID {
67+
guid: 7cae2466-6b19-5fff-869e-9a9717043df4,
68+
},
69+
FunctionGUID {
70+
guid: 7cae2466-6b19-5fff-869e-9a9717043df4,
71+
},
72+
FunctionGUID {
73+
guid: 7f0e055b-1e83-5f7b-a1fd-6a0a3d0b74f5,
74+
},
75+
FunctionGUID {
76+
guid: 88d9b26b-3884-58d6-b164-435d8d888e5c,
77+
},
78+
FunctionGUID {
79+
guid: 8a2b7bda-5fdb-5ba3-888b-20d5b8d7b2cd,
80+
},
81+
FunctionGUID {
82+
guid: 8ff1fc25-6912-5772-8fa3-19e1b996aea7,
83+
},
84+
FunctionGUID {
85+
guid: 951d5c60-d457-5b62-98e7-ade4a37d7cbe,
86+
},
87+
FunctionGUID {
88+
guid: 95bf9d56-3b11-515f-960f-07abf69aed95,
89+
},
90+
FunctionGUID {
91+
guid: 9e30f7d4-0a31-50cf-93f8-490a9e8c300b,
92+
},
93+
FunctionGUID {
94+
guid: a7acb567-eb98-53e4-a843-5c60a8c59f19,
95+
},
96+
FunctionGUID {
97+
guid: ae6f9d26-872c-5b6e-925e-40c0ec95c702,
98+
},
99+
FunctionGUID {
100+
guid: b8b2746b-20aa-5ad2-bcfd-ab5448d952eb,
101+
},
102+
FunctionGUID {
103+
guid: bc4d18a4-96d5-5322-ba99-fcee83648701,
104+
},
105+
FunctionGUID {
106+
guid: c7bd1444-8f5c-5bc6-87c3-48f010b00455,
107+
},
108+
FunctionGUID {
109+
guid: cacf9fe4-7518-5b22-ae3a-ab775dea4c9a,
110+
},
111+
FunctionGUID {
112+
guid: cdb3f650-974f-5686-b81f-10b6544680f4,
113+
},
114+
FunctionGUID {
115+
guid: d344f254-4903-581d-ad93-713c9ff2be2e,
116+
},
117+
FunctionGUID {
118+
guid: d5456209-db22-53a1-906d-1ecb3254ab2d,
119+
},
120+
FunctionGUID {
121+
guid: ec40932b-8293-5ffb-9d31-04c282b6530d,
122+
},
123+
FunctionGUID {
124+
guid: faedbe75-8451-525b-83da-7a57ec96166e,
125+
},
126+
]

‎plugins/warp/src/snapshots/warp_ninja__tests__snapshot__fptostr.snap‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
source: plugins/warp/src/lib.rs
3+
expression: functions
4+
---
5+
[
6+
FunctionGUID {
7+
guid: 9d4dba66-7106-5215-8e64-a47279f67dfe,
8+
},
9+
]

‎plugins/warp/src/snapshots/warp_ninja__tests__snapshot__mbslen.snap‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
source: plugins/warp/src/lib.rs
3+
expression: functions
4+
---
5+
[
6+
FunctionGUID {
7+
guid: 13b16f81-0c6f-5aee-ad9f-0d142658cf18,
8+
},
9+
FunctionGUID {
10+
guid: 1e794537-6289-59e7-bef9-0c72f3989db8,
11+
},
12+
FunctionGUID {
13+
guid: 29690354-fa27-54d1-a8be-18535b19b1c3,
14+
},
15+
FunctionGUID {
16+
guid: 3cc2e827-b707-5c9d-82e9-d76ac3abc904,
17+
},
18+
FunctionGUID {
19+
guid: 6a7eb6dd-be3e-50dd-ae91-cea8f3eb4f06,
20+
},
21+
FunctionGUID {
22+
guid: 6abe3fc2-6d29-5fde-a31e-bb8249db6bf9,
23+
},
24+
FunctionGUID {
25+
guid: 6b0d368e-83d9-55fc-9683-5812e651a49b,
26+
},
27+
FunctionGUID {
28+
guid: 8a2b7bda-5fdb-5ba3-888b-20d5b8d7b2cd,
29+
},
30+
FunctionGUID {
31+
guid: bfaf2f0a-d92d-5ef7-879d-86eb0ca01257,
32+
},
33+
FunctionGUID {
34+
guid: f034945d-32e2-5d86-8a86-3761cc54f419,
35+
},
36+
FunctionGUID {
37+
guid: f552d8ee-3064-50ed-af18-4e60f095c9ea,
38+
},
39+
]

‎plugins/warp/src/snapshots/warp_ninja__tests__snapshot__memicmp.snap‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
source: plugins/warp/src/lib.rs
3+
expression: functions
4+
---
5+
[
6+
FunctionGUID {
7+
guid: cf6e80f2-69aa-5757-a06f-fb2e4866ab14,
8+
},
9+
]

‎plugins/warp/src/snapshots/warp_ninja__tests__snapshot__strnicm.snap‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
source: plugins/warp/src/lib.rs
3+
expression: functions
4+
---
5+
[
6+
FunctionGUID {
7+
guid: 7c350a2d-2282-5625-943e-009f317b8d2c,
8+
},
9+
]

0 commit comments

Comments
 (0)