1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
--- petgraph.orig/Cargo.toml
+++ petgraph/Cargo.toml
@@ -69,2 +69,0 @@
-[dev-dependencies.defmac]
-version = "0.2.1"
--- petgraph.orig/tests/quickcheck.rs
+++ petgraph/tests/quickcheck.rs
@@ -5,4 +5,4 @@
extern crate rand;
-#[macro_use]
-extern crate defmac;
+/*#[macro_use]
+extern crate defmac;*/
@@ -507,3 +507,3 @@
-quickcheck! {
+/*quickcheck! {
fn kosaraju_scc_is_topo_sort(g: Graph<(), ()>) -> bool {
@@ -513,5 +513,5 @@
}
-}
+}*/
-quickcheck! {
+/*quickcheck! {
fn tarjan_scc_is_topo_sort(g: Graph<(), ()>) -> bool {
@@ -521,3 +521,3 @@
}
-}
+}*/
@@ -629,3 +629,3 @@
-fn is_topo_order<N>(gr: &Graph<N, (), Directed>, order: &[NodeIndex]) -> bool {
+/*fn is_topo_order<N>(gr: &Graph<N, (), Directed>, order: &[NodeIndex]) -> bool {
if gr.node_count() != order.len() {
@@ -650,5 +650,5 @@
true
-}
+}*/
-fn subset_is_topo_order<N>(gr: &Graph<N, (), Directed>, order: &[NodeIndex]) -> bool {
+/*fn subset_is_topo_order<N>(gr: &Graph<N, (), Directed>, order: &[NodeIndex]) -> bool {
if gr.node_count() < order.len() {
@@ -683,5 +683,5 @@
true
-}
+}*/
-#[test]
+/*#[test]
fn full_topo() {
@@ -692,5 +692,5 @@
quickcheck::quickcheck(prop as fn(_) -> bool);
-}
+}*/
-#[test]
+/*#[test]
fn full_topo_generic() {
@@ -732,3 +732,3 @@
quickcheck::quickcheck(prop_generic as fn(_) -> bool);
-}
+}*/
@@ -940,3 +940,3 @@
-defmac!(iter_eq a, b => a.eq(b));
+/*defmac!(iter_eq a, b => a.eq(b));
defmac!(nodes_eq ref a, ref b => a.node_references().eq(b.node_references()));
@@ -946,6 +946,6 @@
a.edge_references().map(|e| (e.source(), e.target())),
- b.edge_references().map(|e| (e.source(), e.target()))));
+ b.edge_references().map(|e| (e.source(), e.target()))));*/
quickcheck! {
- fn test_di_from(gr1: DiGraph<i32, i32>) -> () {
+ /*fn test_di_from(gr1: DiGraph<i32, i32>) -> () {
let sgr = StableGraph::from(gr1.clone());
@@ -964,3 +964,3 @@
assert!(edges_eq!(&gr1, &gr2));
- }
+ }*/
@@ -1000,3 +1000,3 @@
- fn stable_di_graph_map_id(gr1: StableDiGraph<usize, usize>) -> () {
+ /*fn stable_di_graph_map_id(gr1: StableDiGraph<usize, usize>) -> () {
let gr2 = gr1.map(|_, &nw| nw, |_, &ew| ew);
@@ -1026,3 +1026,3 @@
assert!(edges_eq!(&gr1, &gr2));
- }
+ }*/
--- petgraph.orig/tests/stable_graph.rs
+++ petgraph/tests/stable_graph.rs
@@ -5,2 +5,2 @@
-#[macro_use]
-extern crate defmac;
+//#[macro_use]
+//extern crate defmac;
@@ -174 +174 @@
-defmac!(edges ref gr, x => gr.edges(x).map(|r| (r.target(), *r.weight())));
+//defmac!(edges ref gr, x => gr.edges(x).map(|r| (r.target(), *r.weight())));
@@ -176 +176 @@
-#[test]
+/*#[test]
@@ -183 +183 @@
-}
+}*/
@@ -191 +191 @@
-#[test]
+/*#[test]
@@ -201 +201 @@
-}
+}*/
@@ -335 +335 @@
-defmac!(iter_eq a, b => a.eq(b));
+/*defmac!(iter_eq a, b => a.eq(b));
@@ -341 +341 @@
- b.edge_references().map(|e| (e.source(), e.target()))));
+ b.edge_references().map(|e| (e.source(), e.target()))));*/
@@ -356 +356 @@
- assert!(nodes_eq!(&gr1, &gr3));
+ /*assert!(nodes_eq!(&gr1, &gr3));
@@ -358 +358 @@
- assert!(edges_eq!(&gr1, &gr3));
+ assert!(edges_eq!(&gr1, &gr3));*/
@@ -371 +371 @@
- assert!(nodes_eq!(&gr4, &ans));
+ /*assert!(nodes_eq!(&gr4, &ans));
@@ -376 +376 @@
- assert!(edges_eq!(&gr5, &ans));
+ assert!(edges_eq!(&gr5, &ans));*/
--- petgraph.orig/tests/list.rs
+++ petgraph/tests/list.rs
@@ -2,4 +2,4 @@
extern crate petgraph;
-#[macro_use]
-extern crate defmac;
+//#[macro_use]
+//extern crate defmac;
@@ -135,3 +135,3 @@
-defmac!(edges ref gr, x => gr.edges(x).map(|r| (r.target(), *r.weight())));
+//defmac!(edges ref gr, x => gr.edges(x).map(|r| (r.target(), *r.weight())));
@@ -142,4 +142,4 @@
let x = n(9);
- assert_equal(edges!(&gr, x), vec![(1, 11), (x, 12), (x, 13)]);
- assert_equal(edges!(&gr, n(0)), vec![(n(3), 1)]);
+ //assert_equal(edges!(&gr, x), vec![(1, 11), (x, 12), (x, 13)]);
+ //assert_equal(edges!(&gr, n(0)), vec![(n(3), 1)]);
//assert_equal(edges!(&gr, n(4)), vec![]);
|
