Skip to content

Commit 7d8910e

Browse files
mwcampbellmwcampbell
authored
refactor!: Rename NodeBuilder to Node and the old Node to FrozenNode (#476)
1 parent 61e4817 commit 7d8910e

File tree

12 files changed

+407
-433
lines changed

12 files changed

+407
-433
lines changed

‎common/src/lib.rs

Lines changed: 96 additions & 90 deletions
Large diffs are not rendered by default.

‎consumer/src/lib.rs

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub use text::{
2222

2323
#[cfg(test)]
2424
mod tests {
25-
use accesskit::{Affine, NodeBuilder, NodeId, Rect, Role, Tree, TreeUpdate, Vec2};
25+
use accesskit::{Affine, Node, NodeId, Rect, Role, Tree, TreeUpdate, Vec2};
2626

2727
use crate::FilterResult;
2828

@@ -46,114 +46,114 @@ mod tests {
4646

4747
pub fn test_tree() -> crate::tree::Tree {
4848
let root = {
49-
let mut builder = NodeBuilder::new(Role::RootWebArea);
50-
builder.set_children(vec![
49+
let mut node = Node::new(Role::RootWebArea);
50+
node.set_children(vec![
5151
PARAGRAPH_0_ID,
5252
PARAGRAPH_1_IGNORED_ID,
5353
PARAGRAPH_2_ID,
5454
PARAGRAPH_3_IGNORED_ID,
5555
]);
56-
builder.build()
56+
node
5757
};
5858
let paragraph_0 = {
59-
let mut builder = NodeBuilder::new(Role::Paragraph);
60-
builder.set_children(vec![LABEL_0_0_IGNORED_ID]);
61-
builder.build()
59+
let mut node = Node::new(Role::Paragraph);
60+
node.set_children(vec![LABEL_0_0_IGNORED_ID]);
61+
node
6262
};
6363
let label_0_0_ignored = {
64-
let mut builder = NodeBuilder::new(Role::Label);
65-
builder.set_name("label_0_0_ignored");
66-
builder.build()
64+
let mut node = Node::new(Role::Label);
65+
node.set_name("label_0_0_ignored");
66+
node
6767
};
6868
let paragraph_1_ignored = {
69-
let mut builder = NodeBuilder::new(Role::Paragraph);
70-
builder.set_transform(Affine::translate(Vec2::new(10.0, 40.0)));
71-
builder.set_bounds(Rect {
69+
let mut node = Node::new(Role::Paragraph);
70+
node.set_transform(Affine::translate(Vec2::new(10.0, 40.0)));
71+
node.set_bounds(Rect {
7272
x0: 0.0,
7373
y0: 0.0,
7474
x1: 800.0,
7575
y1: 40.0,
7676
});
77-
builder.set_children(vec![
77+
node.set_children(vec![
7878
BUTTON_1_0_HIDDEN_ID,
7979
LABEL_1_1_ID,
8080
BUTTON_1_2_HIDDEN_ID,
8181
]);
82-
builder.build()
82+
node
8383
};
8484
let button_1_0_hidden = {
85-
let mut builder = NodeBuilder::new(Role::Button);
86-
builder.set_name("button_1_0_hidden");
87-
builder.set_hidden();
88-
builder.set_children(vec![CONTAINER_1_0_0_HIDDEN_ID]);
89-
builder.build()
85+
let mut node = Node::new(Role::Button);
86+
node.set_name("button_1_0_hidden");
87+
node.set_hidden();
88+
node.set_children(vec![CONTAINER_1_0_0_HIDDEN_ID]);
89+
node
9090
};
9191
let container_1_0_0_hidden = {
92-
let mut builder = NodeBuilder::new(Role::GenericContainer);
93-
builder.set_hidden();
94-
builder.build()
92+
let mut node = Node::new(Role::GenericContainer);
93+
node.set_hidden();
94+
node
9595
};
9696
let label_1_1 = {
97-
let mut builder = NodeBuilder::new(Role::Label);
98-
builder.set_bounds(Rect {
97+
let mut node = Node::new(Role::Label);
98+
node.set_bounds(Rect {
9999
x0: 10.0,
100100
y0: 10.0,
101101
x1: 90.0,
102102
y1: 30.0,
103103
});
104-
builder.set_name("label_1_1");
105-
builder.build()
104+
node.set_name("label_1_1");
105+
node
106106
};
107107
let button_1_2_hidden = {
108-
let mut builder = NodeBuilder::new(Role::Button);
109-
builder.set_name("button_1_2_hidden");
110-
builder.set_hidden();
111-
builder.set_children(vec![CONTAINER_1_2_0_HIDDEN_ID]);
112-
builder.build()
108+
let mut node = Node::new(Role::Button);
109+
node.set_name("button_1_2_hidden");
110+
node.set_hidden();
111+
node.set_children(vec![CONTAINER_1_2_0_HIDDEN_ID]);
112+
node
113113
};
114114
let container_1_2_0_hidden = {
115-
let mut builder = NodeBuilder::new(Role::GenericContainer);
116-
builder.set_hidden();
117-
builder.build()
115+
let mut node = Node::new(Role::GenericContainer);
116+
node.set_hidden();
117+
node
118118
};
119119
let paragraph_2 = {
120-
let mut builder = NodeBuilder::new(Role::Paragraph);
121-
builder.set_children(vec![LABEL_2_0_ID]);
122-
builder.build()
120+
let mut node = Node::new(Role::Paragraph);
121+
node.set_children(vec![LABEL_2_0_ID]);
122+
node
123123
};
124124
let label_2_0 = {
125-
let mut builder = NodeBuilder::new(Role::Label);
126-
builder.set_name("label_2_0");
127-
builder.build()
125+
let mut node = Node::new(Role::Label);
126+
node.set_name("label_2_0");
127+
node
128128
};
129129
let paragraph_3_ignored = {
130-
let mut builder = NodeBuilder::new(Role::Paragraph);
131-
builder.set_children(vec![
130+
let mut node = Node::new(Role::Paragraph);
131+
node.set_children(vec![
132132
EMPTY_CONTAINER_3_0_IGNORED_ID,
133133
LINK_3_1_IGNORED_ID,
134134
BUTTON_3_2_ID,
135135
EMPTY_CONTAINER_3_3_IGNORED_ID,
136136
]);
137-
builder.build()
137+
node
138138
};
139-
let empty_container_3_0_ignored = NodeBuilder::new(Role::GenericContainer).build();
139+
let empty_container_3_0_ignored = Node::new(Role::GenericContainer);
140140
let link_3_1_ignored = {
141-
let mut builder = NodeBuilder::new(Role::Link);
142-
builder.set_children(vec![LABEL_3_1_0_ID]);
143-
builder.set_linked();
144-
builder.build()
141+
let mut node = Node::new(Role::Link);
142+
node.set_children(vec![LABEL_3_1_0_ID]);
143+
node.set_linked();
144+
node
145145
};
146146
let label_3_1_0 = {
147-
let mut builder = NodeBuilder::new(Role::Label);
148-
builder.set_name("label_3_1_0");
149-
builder.build()
147+
let mut node = Node::new(Role::Label);
148+
node.set_name("label_3_1_0");
149+
node
150150
};
151151
let button_3_2 = {
152-
let mut builder = NodeBuilder::new(Role::Button);
153-
builder.set_name("button_3_2");
154-
builder.build()
152+
let mut node = Node::new(Role::Button);
153+
node.set_name("button_3_2");
154+
node
155155
};
156-
let empty_container_3_3_ignored = NodeBuilder::new(Role::GenericContainer).build();
156+
let empty_container_3_3_ignored = Node::new(Role::GenericContainer);
157157
let initial_update = TreeUpdate {
158158
nodes: vec![
159159
(ROOT_ID, root),

0 commit comments

Comments
 (0)