@@ -315,10 +315,10 @@ fn literal_span() {
315
315
316
316
#[ cfg( span_locations) ]
317
317
{
318
- assert_eq ! ( positive. span( ) . start( ) . column, 0 ) ;
319
- assert_eq ! ( positive. span( ) . end( ) . column, 3 ) ;
320
- assert_eq ! ( negative. span( ) . start( ) . column, 0 ) ;
321
- assert_eq ! ( negative. span( ) . end( ) . column, 4 ) ;
318
+ assert_eq ! ( positive. span( ) . start( ) . column( ) , 0 ) ;
319
+ assert_eq ! ( positive. span( ) . end( ) . column( ) , 3 ) ;
320
+ assert_eq ! ( negative. span( ) . start( ) . column( ) , 0 ) ;
321
+ assert_eq ! ( negative. span( ) . end( ) . column( ) , 4 ) ;
322
322
assert_eq ! ( subspan. unwrap( ) . source_text( ) . unwrap( ) , "." ) ;
323
323
}
324
324
@@ -434,11 +434,11 @@ testing 123
434
434
#[ test]
435
435
fn default_span ( ) {
436
436
let start = Span :: call_site ( ) . start ( ) ;
437
- assert_eq ! ( start. line, 1 ) ;
438
- assert_eq ! ( start. column, 0 ) ;
437
+ assert_eq ! ( start. line( ) , 1 ) ;
438
+ assert_eq ! ( start. column( ) , 0 ) ;
439
439
let end = Span :: call_site ( ) . end ( ) ;
440
- assert_eq ! ( end. line, 1 ) ;
441
- assert_eq ! ( end. column, 0 ) ;
440
+ assert_eq ! ( end. line( ) , 1 ) ;
441
+ assert_eq ! ( end. column( ) , 0 ) ;
442
442
let source_file = Span :: call_site ( ) . source_file ( ) ;
443
443
assert_eq ! ( source_file. path( ) . to_string_lossy( ) , "<unspecified>" ) ;
444
444
assert ! ( !source_file. is_real( ) ) ;
@@ -471,10 +471,10 @@ fn span_join() {
471
471
472
472
let start = joined1. unwrap ( ) . start ( ) ;
473
473
let end = joined1. unwrap ( ) . end ( ) ;
474
- assert_eq ! ( start. line, 1 ) ;
475
- assert_eq ! ( start. column, 0 ) ;
476
- assert_eq ! ( end. line, 2 ) ;
477
- assert_eq ! ( end. column, 3 ) ;
474
+ assert_eq ! ( start. line( ) , 1 ) ;
475
+ assert_eq ! ( start. column( ) , 0 ) ;
476
+ assert_eq ! ( end. line( ) , 2 ) ;
477
+ assert_eq ! ( end. column( ) , 3 ) ;
478
478
479
479
assert_eq ! (
480
480
joined1. unwrap( ) . source_file( ) ,
@@ -719,12 +719,12 @@ fn check_spans_internal(ts: TokenStream, lines: &mut &[(usize, usize, usize, usi
719
719
* lines = rest;
720
720
721
721
let start = i. span ( ) . start ( ) ;
722
- assert_eq ! ( start. line, sline, "sline did not match for {}" , i) ;
723
- assert_eq ! ( start. column, scol, "scol did not match for {}" , i) ;
722
+ assert_eq ! ( start. line( ) , sline, "sline did not match for {}" , i) ;
723
+ assert_eq ! ( start. column( ) , scol, "scol did not match for {}" , i) ;
724
724
725
725
let end = i. span ( ) . end ( ) ;
726
- assert_eq ! ( end. line, eline, "eline did not match for {}" , i) ;
727
- assert_eq ! ( end. column, ecol, "ecol did not match for {}" , i) ;
726
+ assert_eq ! ( end. line( ) , eline, "eline did not match for {}" , i) ;
727
+ assert_eq ! ( end. column( ) , ecol, "ecol did not match for {}" , i) ;
728
728
729
729
if let TokenTree :: Group ( g) = i {
730
730
check_spans_internal ( g. stream ( ) . clone ( ) , lines) ;
0 commit comments