Skip to content

Commit 82514a5

Browse files
committed
updating to rust 2021: remove macro_use and extern crate from all tests
1 parent ea8c556 commit 82514a5

File tree

7 files changed

+35
-49
lines changed

7 files changed

+35
-49
lines changed

tests/iter.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#[macro_use]
2-
extern crate ego_tree;
1+
use ego_tree::tree;
32

43
#[test]
54
fn into_iter() {

tests/macro.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#[macro_use]
2-
extern crate ego_tree;
3-
4-
use ego_tree::Tree;
1+
use ego_tree::{tree, Tree};
52

63
#[test]
74
fn root() {

tests/node_mut.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#[macro_use]
2-
extern crate ego_tree;
3-
4-
use ego_tree::NodeRef;
1+
use ego_tree::{tree, NodeRef};
52

63
#[test]
74
fn value() {

tests/node_ref.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#[macro_use]
2-
extern crate ego_tree;
1+
use ego_tree::tree;
32

43
#[test]
54
fn value() {

tests/serde.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#![cfg(feature = "serde")]
2-
#[macro_use]
3-
extern crate ego_tree;
2+
43
use std::assert_eq;
54

6-
use ego_tree::Tree;
5+
use ego_tree::{tree, Tree};
76

87
#[test]
98
fn test_serialize() {
109
let tree = tree!("r" => {"a", "b" => { "d", "e" }, "c"});
1110

1211
let serialized = serde_json::to_string(&tree).unwrap();
12+
println!("{serialized}");
1313
let deserialized: Tree<&str> = serde_json::from_str(&serialized).unwrap();
1414

1515
assert_eq!(tree, deserialized);

tests/subtree.rs

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
1-
#[macro_use]
2-
extern crate ego_tree;
1+
use ego_tree::tree;
32

4-
#[cfg(test)]
5-
mod test {
6-
#[test]
7-
fn prepend_subtree() {
8-
let mut tree = tree!('a' => { 'b', 'c' => { 'd', 'e' } });
9-
let node_id = tree.root().first_child().unwrap().id();
10-
let mut node = tree.get_mut(node_id).unwrap();
11-
assert_eq!(node.value(), &'b');
3+
#[test]
4+
fn prepend_subtree() {
5+
let mut tree = tree!('a' => { 'b', 'c' => { 'd', 'e' } });
6+
let node_id = tree.root().first_child().unwrap().id();
7+
let mut node = tree.get_mut(node_id).unwrap();
8+
assert_eq!(node.value(), &'b');
129

13-
let subtree = tree!('f' => { 'g', 'h' => { 'i', 'j' } });
14-
let mut root_subtree = node.prepend_subtree(subtree);
15-
assert_eq!(root_subtree.parent().unwrap().value(), &'b');
16-
assert_eq!(
17-
root_subtree.parent().unwrap().parent().unwrap().value(),
18-
&'a'
19-
);
10+
let subtree = tree!('f' => { 'g', 'h' => { 'i', 'j' } });
11+
let mut root_subtree = node.prepend_subtree(subtree);
12+
assert_eq!(root_subtree.parent().unwrap().value(), &'b');
13+
assert_eq!(
14+
root_subtree.parent().unwrap().parent().unwrap().value(),
15+
&'a'
16+
);
2017

21-
let new_tree =
22-
tree!('a' => { 'b' => { 'f' => { 'g', 'h' => { 'i', 'j' } } }, 'c' => { 'd', 'e' } });
23-
assert_eq!(format!("{:#?}", tree), format!("{:#?}", new_tree));
24-
}
18+
let new_tree =
19+
tree!('a' => { 'b' => { 'f' => { 'g', 'h' => { 'i', 'j' } } }, 'c' => { 'd', 'e' } });
20+
assert_eq!(format!("{:#?}", tree), format!("{:#?}", new_tree));
21+
}
2522

26-
#[test]
27-
fn append_subtree() {
28-
let mut tree = tree!('a' => { 'b', 'c' });
29-
let mut node = tree.root_mut();
30-
assert_eq!(node.value(), &'a');
23+
#[test]
24+
fn append_subtree() {
25+
let mut tree = tree!('a' => { 'b', 'c' });
26+
let mut node = tree.root_mut();
27+
assert_eq!(node.value(), &'a');
3128

32-
let subtree = tree!('d' => { 'e', 'f' });
33-
let mut root_subtree = node.append_subtree(subtree);
34-
assert_eq!(root_subtree.parent().unwrap().value(), &'a');
29+
let subtree = tree!('d' => { 'e', 'f' });
30+
let mut root_subtree = node.append_subtree(subtree);
31+
assert_eq!(root_subtree.parent().unwrap().value(), &'a');
3532

36-
let new_tree = tree!('a' => { 'b', 'c', 'd' => { 'e', 'f' } });
37-
assert_eq!(format!("{:#?}", tree), format!("{:#?}", new_tree));
38-
}
33+
let new_tree = tree!('a' => { 'b', 'c', 'd' => { 'e', 'f' } });
34+
assert_eq!(format!("{:#?}", tree), format!("{:#?}", new_tree));
3935
}

tests/tree.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
extern crate ego_tree;
2-
31
use ego_tree::{tree, Tree};
42

53
#[test]

0 commit comments

Comments
 (0)