Skip to content

Commit 62e4c20

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 161607 b: refs/heads/snap-stage3 c: 0ea3134 h: refs/heads/master i: 161605: c6a73a6 161603: 600d0ec 161599: 42f0733 v: v3
1 parent 26370ac commit 62e4c20

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c0ef959b31bb2f9c1df811f51c5aab6c1d9ca3dc
4+
refs/heads/snap-stage3: 0ea31348d90d24c7a36d0543833b1174083bc7cb
55
refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/liblog/directive.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ mod tests {
100100
#[test]
101101
fn parse_logging_spec_valid() {
102102
let (dirs, filter) = parse_logging_spec("crate1::mod1=1,crate1::mod2,crate2=4");
103-
let dirs = dirs.as_slice();
104103
assert_eq!(dirs.len(), 3);
105104
assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
106105
assert_eq!(dirs[0].level, 1);
@@ -117,7 +116,6 @@ mod tests {
117116
fn parse_logging_spec_invalid_crate() {
118117
// test parse_logging_spec with multiple = in specification
119118
let (dirs, filter) = parse_logging_spec("crate1::mod1=1=2,crate2=4");
120-
let dirs = dirs.as_slice();
121119
assert_eq!(dirs.len(), 1);
122120
assert_eq!(dirs[0].name, Some("crate2".to_string()));
123121
assert_eq!(dirs[0].level, 4);
@@ -128,7 +126,6 @@ mod tests {
128126
fn parse_logging_spec_invalid_log_level() {
129127
// test parse_logging_spec with 'noNumber' as log level
130128
let (dirs, filter) = parse_logging_spec("crate1::mod1=noNumber,crate2=4");
131-
let dirs = dirs.as_slice();
132129
assert_eq!(dirs.len(), 1);
133130
assert_eq!(dirs[0].name, Some("crate2".to_string()));
134131
assert_eq!(dirs[0].level, 4);
@@ -139,7 +136,6 @@ mod tests {
139136
fn parse_logging_spec_string_log_level() {
140137
// test parse_logging_spec with 'warn' as log level
141138
let (dirs, filter) = parse_logging_spec("crate1::mod1=wrong,crate2=warn");
142-
let dirs = dirs.as_slice();
143139
assert_eq!(dirs.len(), 1);
144140
assert_eq!(dirs[0].name, Some("crate2".to_string()));
145141
assert_eq!(dirs[0].level, ::WARN);
@@ -150,7 +146,6 @@ mod tests {
150146
fn parse_logging_spec_empty_log_level() {
151147
// test parse_logging_spec with '' as log level
152148
let (dirs, filter) = parse_logging_spec("crate1::mod1=wrong,crate2=");
153-
let dirs = dirs.as_slice();
154149
assert_eq!(dirs.len(), 1);
155150
assert_eq!(dirs[0].name, Some("crate2".to_string()));
156151
assert_eq!(dirs[0].level, ::MAX_LOG_LEVEL);
@@ -161,7 +156,6 @@ mod tests {
161156
fn parse_logging_spec_global() {
162157
// test parse_logging_spec with no crate
163158
let (dirs, filter) = parse_logging_spec("warn,crate2=4");
164-
let dirs = dirs.as_slice();
165159
assert_eq!(dirs.len(), 2);
166160
assert_eq!(dirs[0].name, None);
167161
assert_eq!(dirs[0].level, 2);
@@ -173,7 +167,6 @@ mod tests {
173167
#[test]
174168
fn parse_logging_spec_valid_filter() {
175169
let (dirs, filter) = parse_logging_spec("crate1::mod1=1,crate1::mod2,crate2=4/abc");
176-
let dirs = dirs.as_slice();
177170
assert_eq!(dirs.len(), 3);
178171
assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
179172
assert_eq!(dirs[0].level, 1);
@@ -183,26 +176,24 @@ mod tests {
183176

184177
assert_eq!(dirs[2].name, Some("crate2".to_string()));
185178
assert_eq!(dirs[2].level, 4);
186-
assert!(filter.is_some() && filter.unwrap().to_string().as_slice() == "abc");
179+
assert!(filter.is_some() && filter.unwrap().to_string() == "abc");
187180
}
188181

189182
#[test]
190183
fn parse_logging_spec_invalid_crate_filter() {
191184
let (dirs, filter) = parse_logging_spec("crate1::mod1=1=2,crate2=4/a.c");
192-
let dirs = dirs.as_slice();
193185
assert_eq!(dirs.len(), 1);
194186
assert_eq!(dirs[0].name, Some("crate2".to_string()));
195187
assert_eq!(dirs[0].level, 4);
196-
assert!(filter.is_some() && filter.unwrap().to_string().as_slice() == "a.c");
188+
assert!(filter.is_some() && filter.unwrap().to_string() == "a.c");
197189
}
198190

199191
#[test]
200192
fn parse_logging_spec_empty_with_filter() {
201193
let (dirs, filter) = parse_logging_spec("crate1/a*c");
202-
let dirs = dirs.as_slice();
203194
assert_eq!(dirs.len(), 1);
204195
assert_eq!(dirs[0].name, Some("crate1".to_string()));
205196
assert_eq!(dirs[0].level, ::MAX_LOG_LEVEL);
206-
assert!(filter.is_some() && filter.unwrap().to_string().as_slice() == "a*c");
197+
assert!(filter.is_some() && filter.unwrap().to_string() == "a*c");
207198
}
208199
}

0 commit comments

Comments
 (0)