Skip to content

Commit 37f7db9

Browse files
BramOtteBramOtte
committed
run cargo fmt
1 parent ad4ed36 commit 37f7db9

File tree

3 files changed

+64
-50
lines changed

3 files changed

+64
-50
lines changed

‎crates/redpiler/src/backend/direct/compile.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn compile_node(
132132
let forward_links = &forward_links[fwd_link_begin as usize..fwd_link_end as usize];
133133
let fwd_link_len = forward_links.len();
134134
assert!(fwd_link_len < u16::MAX as usize);
135-
135+
136136
// Safety: These are simply placeholder values and should not ever be read
137137
let mut first_links = [ForwardLink::new(unsafe { NodeId::from_index(0) }, false, 0); 5];
138138
let num_first = fwd_link_len.min(first_links.len());
@@ -173,7 +173,6 @@ pub fn compile(
173173
options: &CompilerOptions,
174174
_monitor: Arc<TaskMonitor>,
175175
) {
176-
177176
backend.blocks = Vec::with_capacity(graph.node_count());
178177

179178
// Create a mapping from compile to backend node indices
@@ -182,11 +181,14 @@ pub fn compile(
182181
for node in graph.node_indices() {
183182
nodes_map.insert(node, nodes_len);
184183

185-
let outgoing = if graph[node].ty == crate::compile_graph::NodeType::Constant {0} else {graph.neighbors_directed(node, Outgoing).count()};
184+
let outgoing = if graph[node].ty == crate::compile_graph::NodeType::Constant {
185+
0
186+
} else {
187+
graph.neighbors_directed(node, Outgoing).count()
188+
};
186189
let extra_nodes = (outgoing + 15 - 5) / 16;
187190
nodes_len += 1 + extra_nodes;
188191

189-
190192
let block = graph[node].block.map(|(pos, id)| (pos, Block::from_id(id)));
191193
backend.blocks.push(block);
192194

@@ -207,15 +209,14 @@ pub fn compile(
207209
&mut backend.noteblock_info,
208210
&mut backend.forward_links,
209211
&mut stats,
210-
&mut nodes
212+
&mut nodes,
211213
);
212214
}
213215
stats.nodes_bytes = nodes_len * std::mem::size_of::<Node>();
214216
trace!("{:#?}", stats);
215217

218+
assert_eq!(nodes.len(), nodes_len);
216219

217-
assert_eq!(nodes.len(), nodes_len);
218-
219220
backend.nodes = Nodes::new(nodes.into_boxed_slice());
220221

221222
// Create a mapping from block pos to backend NodeId

‎crates/redpiler/src/backend/direct/mod.rs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,14 @@ impl DirectBackend {
128128
node.changed = true;
129129
node.powered = powered;
130130
node.output_power = new_power;
131-
131+
132132
let node = &self.nodes[node_id];
133133

134134
// Safety: node is followed by the correct number of ForwardLink blocks
135135
// Safety: node.fwd_links and node.fwd_link_len are not modified for links's lifetime
136-
let links: &[ForwardLink] = unsafe {std::slice::from_raw_parts(
137-
node.fwd_links.as_ptr(),
138-
node.fwd_link_len as usize
139-
)};
136+
let links: &[ForwardLink] = unsafe {
137+
std::slice::from_raw_parts(node.fwd_links.as_ptr(), node.fwd_link_len as usize)
138+
};
140139

141140
for forward_link in links {
142141
let side = forward_link.side();
@@ -390,7 +389,13 @@ impl fmt::Display for DirectBackend {
390389
} else {
391390
"No Pos".to_string()
392391
};
393-
writeln!(f, " n{} [ label = \"{}\\n({})\" ];", id.index(), label, pos)?;
392+
writeln!(
393+
f,
394+
" n{} [ label = \"{}\\n({})\" ];",
395+
id.index(),
396+
label,
397+
pos
398+
)?;
394399

395400
for link in self.nodes.forward_link(id) {
396401
let out_index = link.node().index();
@@ -399,7 +404,10 @@ impl fmt::Display for DirectBackend {
399404
writeln!(
400405
f,
401406
" n{} -> n{} [ label = \"{}\"{} ];",
402-
id.index(), out_index, distance, color
407+
id.index(),
408+
out_index,
409+
distance,
410+
color
403411
)?;
404412
}
405413
}

‎crates/redpiler/src/backend/direct/node.rs‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ impl NodeId {
2222
#[derive(Default)]
2323
pub struct Nodes {
2424
nodes: Box<[Node]>,
25-
valid: Box<[bool]>
25+
valid: Box<[bool]>,
2626
}
2727

2828
impl Nodes {
2929
pub fn new(nodes: Box<[Node]>) -> Nodes {
30-
let mut nodes = Nodes { nodes, valid: Box::new([]) };
31-
30+
let mut nodes = Nodes {
31+
nodes,
32+
valid: Box::new([]),
33+
};
34+
3235
let mut valid = vec![false; nodes.nodes.len()].into_boxed_slice();
3336
for id in nodes.ids() {
3437
valid[id.index()] = true;
@@ -40,7 +43,11 @@ impl Nodes {
4043

4144
pub fn get(&self, idx: usize) -> NodeId {
4245
if idx >= self.nodes.len() {
43-
panic!("node index out of bounds: {}, len={}", idx, self.nodes.len())
46+
panic!(
47+
"node index out of bounds: {}, len={}",
48+
idx,
49+
self.nodes.len()
50+
)
4451
}
4552
if !self.valid[idx] {
4653
panic!("node index invalid: {}", idx)
@@ -49,44 +56,45 @@ impl Nodes {
4956
}
5057

5158
pub fn forward_link(&self, id: NodeId) -> &[ForwardLink] {
52-
// Safety: Node is followed by correct number of forward links
59+
// Safety: Node is followed by correct number of forward links
5360
unsafe { self[id].forward_links() }
5461
}
5562

56-
pub fn ids(&self) -> impl '_ + Iterator<Item=NodeId> {
63+
pub fn ids(&self) -> impl '_ + Iterator<Item = NodeId> {
5764
self.enumerate().map(|(id, _)| id)
5865
}
5966

60-
pub fn enumerate(&self) -> impl Iterator<Item=(NodeId, &Node)> {
67+
pub fn enumerate(&self) -> impl Iterator<Item = (NodeId, &Node)> {
6168
let mut skip = 0;
62-
self.nodes.iter().enumerate()
63-
.filter_map(move |(i, node)| {
64-
if skip > 0 {
65-
skip -= 1;
66-
return None;
67-
}
68-
skip = node.forward_link_blocks();
69-
70-
// Safety: Bounds checked and ForwardLinks skipped over
71-
let id = unsafe { NodeId::from_index(i)};
72-
Some((id, node))
73-
})
69+
self.nodes.iter().enumerate().filter_map(move |(i, node)| {
70+
if skip > 0 {
71+
skip -= 1;
72+
return None;
73+
}
74+
skip = node.forward_link_blocks();
75+
76+
// Safety: Bounds checked and ForwardLinks skipped over
77+
let id = unsafe { NodeId::from_index(i) };
78+
Some((id, node))
79+
})
7480
}
7581

76-
pub fn enumerate_mut(&mut self) -> impl Iterator<Item=(NodeId, &mut Node)> {
82+
pub fn enumerate_mut(&mut self) -> impl Iterator<Item = (NodeId, &mut Node)> {
7783
let mut skip = 0;
78-
self.nodes.iter_mut().enumerate()
84+
self.nodes
85+
.iter_mut()
86+
.enumerate()
7987
.filter_map(move |(i, node)| {
8088
if skip > 0 {
8189
skip -= 1;
8290
return None;
8391
}
8492
skip = node.forward_link_blocks();
85-
93+
8694
// Safety: Bounds checked and ForwardLinks skipped over
87-
let id = unsafe { NodeId::from_index(i)};
95+
let id = unsafe { NodeId::from_index(i) };
8896
Some((id, node))
89-
})
97+
})
9098
}
9199
}
92100

@@ -224,29 +232,26 @@ impl Node {
224232
#[inline(always)]
225233
pub fn forward_link_blocks(&self) -> usize {
226234
const BLOCK_SIZE: usize = std::mem::size_of::<Node>() / std::mem::size_of::<ForwardLink>();
227-
235+
228236
const {
229237
assert!(std::mem::size_of::<Node>() % std::mem::size_of::<ForwardLink>() == 0);
230238
assert!(std::mem::align_of::<Node>() % std::mem::align_of::<ForwardLink>() == 0);
231-
assert!(std::mem::offset_of!(Node, fwd_links) + std::mem::size_of::<LinkBuffer>() == std::mem::size_of::<Node>())
239+
assert!(
240+
std::mem::offset_of!(Node, fwd_links) + std::mem::size_of::<LinkBuffer>()
241+
== std::mem::size_of::<Node>()
242+
)
232243
}
233244

234-
(self.fwd_link_len as usize + BLOCK_SIZE-1 - self.fwd_links.len()) / BLOCK_SIZE
245+
(self.fwd_link_len as usize + BLOCK_SIZE - 1 - self.fwd_links.len()) / BLOCK_SIZE
235246
}
236247

237248
/// Safety: self must be followed by correct number of forward links
238249
pub unsafe fn forward_links(&self) -> &[ForwardLink] {
239-
std::slice::from_raw_parts(
240-
self.fwd_links.as_ptr(),
241-
self.fwd_link_len as usize
242-
)
250+
std::slice::from_raw_parts(self.fwd_links.as_ptr(), self.fwd_link_len as usize)
243251
}
244252

245253
/// Safety: self must be followed by correct number of forward links
246254
pub unsafe fn forward_links_mut(&mut self) -> &mut [ForwardLink] {
247-
std::slice::from_raw_parts_mut(
248-
self.fwd_links.as_mut_ptr(),
249-
self.fwd_link_len as usize
250-
)
255+
std::slice::from_raw_parts_mut(self.fwd_links.as_mut_ptr(), self.fwd_link_len as usize)
251256
}
252-
}
257+
}

0 commit comments

Comments
 (0)