Skip to content

Commit 97d95b7

Browse files
jturner314LukeMathWalker
authored andcommitted
Deny warnings in CI (except for nightly channel) (#680)
* Deny warnings in CI (except for nightly channel) * Fix deprecation warnings about RcArray in test
1 parent 5ad1afa commit 97d95b7

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ matrix:
77
- rust: 1.32.0
88
env:
99
- FEATURES='test docs'
10+
- RUSTFLAGS='-D warnings'
1011
- rust: stable
1112
env:
1213
- FEATURES='test docs'
14+
- RUSTFLAGS='-D warnings'
1315
- rust: beta
1416
env:
1517
- FEATURES='test docs'
1618
- CHANNEL='beta'
19+
- RUSTFLAGS='-D warnings'
1720
- rust: nightly
1821
env:
1922
- FEATURES='test docs'

serialization-tests/tests/serialize.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ extern crate rmp_serde;
99
#[cfg(feature = "ron")]
1010
extern crate ron;
1111

12-
use ndarray::{arr0, arr1, arr2, s, ArrayD, IxDyn, RcArray, RcArray1, RcArray2};
12+
use ndarray::{arr0, arr1, arr2, s, ArcArray, ArrayD, Ix2, IxDyn};
1313

1414
#[test]
1515
fn serial_many_dim_serde() {
1616
{
1717
let a = arr0::<f32>(2.72);
1818
let serial = serde_json::to_string(&a).unwrap();
1919
println!("Serde encode {:?} => {:?}", a, serial);
20-
let res = serde_json::from_str::<RcArray<f32, _>>(&serial);
20+
let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
2121
println!("{:?}", res);
2222
assert_eq!(a, res.unwrap());
2323
}
@@ -26,7 +26,7 @@ fn serial_many_dim_serde() {
2626
let a = arr1::<f32>(&[2.72, 1., 2.]);
2727
let serial = serde_json::to_string(&a).unwrap();
2828
println!("Serde encode {:?} => {:?}", a, serial);
29-
let res = serde_json::from_str::<RcArray1<f32>>(&serial);
29+
let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
3030
println!("{:?}", res);
3131
assert_eq!(a, res.unwrap());
3232
}
@@ -35,21 +35,21 @@ fn serial_many_dim_serde() {
3535
let a = arr2(&[[3., 1., 2.2], [3.1, 4., 7.]]);
3636
let serial = serde_json::to_string(&a).unwrap();
3737
println!("Serde encode {:?} => {:?}", a, serial);
38-
let res = serde_json::from_str::<RcArray2<f32>>(&serial);
38+
let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
3939
println!("{:?}", res);
4040
assert_eq!(a, res.unwrap());
4141
let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"##;
42-
let b = serde_json::from_str::<RcArray2<f32>>(text);
42+
let b = serde_json::from_str::<ArcArray<f32, _>>(text);
4343
assert_eq!(a, b.unwrap());
4444
}
4545

4646
{
4747
// Test a sliced array.
48-
let mut a = RcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
48+
let mut a = ArcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
4949
a.slice_collapse(s![..;-1, .., .., ..2]);
5050
let serial = serde_json::to_string(&a).unwrap();
5151
println!("Encode {:?} => {:?}", a, serial);
52-
let res = serde_json::from_str::<RcArray<f32, _>>(&serial);
52+
let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
5353
println!("{:?}", res);
5454
assert_eq!(a, res.unwrap());
5555
}
@@ -61,7 +61,7 @@ fn serial_ixdyn_serde() {
6161
let a = arr0::<f32>(2.72).into_dyn();
6262
let serial = serde_json::to_string(&a).unwrap();
6363
println!("Serde encode {:?} => {:?}", a, serial);
64-
let res = serde_json::from_str::<RcArray<f32, _>>(&serial);
64+
let res = serde_json::from_str::<ArcArray<f32, _>>(&serial);
6565
println!("{:?}", res);
6666
assert_eq!(a, res.unwrap());
6767
}
@@ -98,13 +98,13 @@ fn serial_ixdyn_serde() {
9898
fn serial_wrong_count_serde() {
9999
// one element too few
100100
let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4]}"##;
101-
let arr = serde_json::from_str::<RcArray2<f32>>(text);
101+
let arr = serde_json::from_str::<ArcArray<f32, Ix2>>(text);
102102
println!("{:?}", arr);
103103
assert!(arr.is_err());
104104

105105
// future version
106106
let text = r##"{"v":200,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"##;
107-
let arr = serde_json::from_str::<RcArray2<f32>>(text);
107+
let arr = serde_json::from_str::<ArcArray<f32, Ix2>>(text);
108108
println!("{:?}", arr);
109109
assert!(arr.is_err());
110110
}
@@ -120,7 +120,7 @@ fn serial_many_dim_serde_msgpack() {
120120
.unwrap();
121121

122122
let mut deserializer = rmp_serde::Deserializer::new(&buf[..]);
123-
let a_de: RcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
123+
let a_de: ArcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
124124

125125
assert_eq!(a, a_de);
126126
}
@@ -134,7 +134,7 @@ fn serial_many_dim_serde_msgpack() {
134134
.unwrap();
135135

136136
let mut deserializer = rmp_serde::Deserializer::new(&buf[..]);
137-
let a_de: RcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
137+
let a_de: ArcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
138138

139139
assert_eq!(a, a_de);
140140
}
@@ -148,14 +148,14 @@ fn serial_many_dim_serde_msgpack() {
148148
.unwrap();
149149

150150
let mut deserializer = rmp_serde::Deserializer::new(&buf[..]);
151-
let a_de: RcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
151+
let a_de: ArcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
152152

153153
assert_eq!(a, a_de);
154154
}
155155

156156
{
157157
// Test a sliced array.
158-
let mut a = RcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
158+
let mut a = ArcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
159159
a.slice_collapse(s![..;-1, .., .., ..2]);
160160

161161
let mut buf = Vec::new();
@@ -164,7 +164,7 @@ fn serial_many_dim_serde_msgpack() {
164164
.unwrap();
165165

166166
let mut deserializer = rmp_serde::Deserializer::new(&buf[..]);
167-
let a_de: RcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
167+
let a_de: ArcArray<f32, _> = serde::Deserialize::deserialize(&mut deserializer).unwrap();
168168

169169
assert_eq!(a, a_de);
170170
}
@@ -181,7 +181,7 @@ fn serial_many_dim_ron() {
181181

182182
let a_s = ron_serialize(&a).unwrap();
183183

184-
let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
184+
let a_de: ArcArray<f32, _> = ron_deserialize(&a_s).unwrap();
185185

186186
assert_eq!(a, a_de);
187187
}
@@ -191,7 +191,7 @@ fn serial_many_dim_ron() {
191191

192192
let a_s = ron_serialize(&a).unwrap();
193193

194-
let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
194+
let a_de: ArcArray<f32, _> = ron_deserialize(&a_s).unwrap();
195195

196196
assert_eq!(a, a_de);
197197
}
@@ -201,19 +201,19 @@ fn serial_many_dim_ron() {
201201

202202
let a_s = ron_serialize(&a).unwrap();
203203

204-
let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
204+
let a_de: ArcArray<f32, _> = ron_deserialize(&a_s).unwrap();
205205

206206
assert_eq!(a, a_de);
207207
}
208208

209209
{
210210
// Test a sliced array.
211-
let mut a = RcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
211+
let mut a = ArcArray::linspace(0., 31., 32).reshape((2, 2, 2, 4));
212212
a.slice_collapse(s![..;-1, .., .., ..2]);
213213

214214
let a_s = ron_serialize(&a).unwrap();
215215

216-
let a_de: RcArray<f32, _> = ron_deserialize(&a_s).unwrap();
216+
let a_de: ArcArray<f32, _> = ron_deserialize(&a_s).unwrap();
217217

218218
assert_eq!(a, a_de);
219219
}

0 commit comments

Comments
 (0)