@@ -15,8 +15,8 @@ use std::path::PathBuf;
15
15
use std:: rc:: Rc ;
16
16
use std:: { cmp, fmt, iter, str} ;
17
17
18
- use serde:: ser:: { self , Serialize , Serializer } ;
19
18
use serde:: de:: { Deserialize , Deserializer } ;
19
+ use serde:: ser:: { self , Serialize , Serializer } ;
20
20
use serde_json as json;
21
21
22
22
use syntax:: codemap:: { self , FileMap } ;
@@ -75,8 +75,9 @@ impl Serialize for FileName {
75
75
{
76
76
let s = match self {
77
77
FileName :: Stdin => Ok ( "stdin" ) ,
78
- FileName :: Real ( path) => path. to_str ( ) . ok_or_else ( ||
79
- ser:: Error :: custom ( "path can't be serialized as UTF-8 string" ) )
78
+ FileName :: Real ( path) => path
79
+ . to_str ( )
80
+ . ok_or_else ( || ser:: Error :: custom ( "path can't be serialized as UTF-8 string" ) ) ,
80
81
} ;
81
82
82
83
s. and_then ( |s| serializer. serialize_str ( s) )
@@ -385,29 +386,37 @@ mod test {
385
386
) ;
386
387
}
387
388
388
- use std:: { collections:: HashMap , path:: PathBuf } ;
389
- use super :: { FileName , FileLines } ;
390
389
use super :: json:: { self , json, json_internal} ;
390
+ use super :: { FileLines , FileName } ;
391
+ use std:: { collections:: HashMap , path:: PathBuf } ;
391
392
392
393
#[ test]
393
394
fn file_lines_to_json ( ) {
394
395
let ranges: HashMap < FileName , Vec < Range > > = [
395
- ( FileName :: Real ( PathBuf :: from ( "src/main.rs" ) ) , vec ! [
396
- Range :: new( 1 , 3 ) ,
397
- Range :: new( 5 , 7 )
398
- ] ) ,
399
- ( FileName :: Real ( PathBuf :: from ( "src/lib.rs" ) ) , vec ! [
400
- Range :: new( 1 , 7 )
401
- ] ) ] . iter ( ) . cloned ( ) . collect ( ) ;
396
+ (
397
+ FileName :: Real ( PathBuf :: from ( "src/main.rs" ) ) ,
398
+ vec ! [ Range :: new( 1 , 3 ) , Range :: new( 5 , 7 ) ] ,
399
+ ) ,
400
+ (
401
+ FileName :: Real ( PathBuf :: from ( "src/lib.rs" ) ) ,
402
+ vec ! [ Range :: new( 1 , 7 ) ] ,
403
+ ) ,
404
+ ]
405
+ . iter ( )
406
+ . cloned ( )
407
+ . collect ( ) ;
402
408
403
409
let file_lines = FileLines :: from_ranges ( ranges) ;
404
410
let mut spans = file_lines. to_json_spans ( ) ;
405
411
spans. sort ( ) ;
406
412
let json = json:: to_value ( & spans) . unwrap ( ) ;
407
- assert_eq ! ( json, json! { [
408
- { "file" : "src/lib.rs" , "range" : [ 1 , 7 ] } ,
409
- { "file" : "src/main.rs" , "range" : [ 1 , 3 ] } ,
410
- { "file" : "src/main.rs" , "range" : [ 5 , 7 ] } ,
411
- ] } ) ;
413
+ assert_eq ! (
414
+ json,
415
+ json! { [
416
+ { "file" : "src/lib.rs" , "range" : [ 1 , 7 ] } ,
417
+ { "file" : "src/main.rs" , "range" : [ 1 , 3 ] } ,
418
+ { "file" : "src/main.rs" , "range" : [ 5 , 7 ] } ,
419
+ ] }
420
+ ) ;
412
421
}
413
422
}
0 commit comments