@@ -400,25 +400,25 @@ fn parse_source(name: str, j: json::json) -> source {
400
400
json:: dict( j) {
401
401
let mut url = alt j. find( "url") {
402
402
some( json:: string( u) ) {
403
- u
403
+ * u
404
404
}
405
405
_ { fail "needed ' url' field in source"; }
406
406
} ;
407
407
let method = alt j. find( "method") {
408
408
some( json:: string( u) ) {
409
- u
409
+ * u
410
410
}
411
411
_ { assume_source_method( url) }
412
412
} ;
413
413
let key = alt j. find( "key") {
414
414
some( json:: string( u) ) {
415
- some( u)
415
+ some( * u)
416
416
}
417
417
_ { none }
418
418
} ;
419
419
let keyfp = alt j. find( "keyfp") {
420
420
some( json:: string( u) ) {
421
- some( u)
421
+ some( * u)
422
422
}
423
423
_ { none }
424
424
} ;
@@ -455,13 +455,13 @@ fn try_parse_sources(filename: str, sources: map::hashmap<str, source>) {
455
455
fn load_one_source_package( src: source, p: map:: hashmap<str , json:: json>) {
456
456
let name = alt p. find( "name") {
457
457
some( json:: string( n) ) {
458
- if !valid_pkg_name( n) {
459
- warn( "malformed source json: " + src. name + ", ' " + n + "' "+
458
+ if !valid_pkg_name( * n) {
459
+ warn( "malformed source json: " + src. name + ", ' " + * n + "' "+
460
460
" is an invalid name ( alphanumeric, underscores and" +
461
461
" dashes only) ") ;
462
462
ret;
463
463
}
464
- n
464
+ * n
465
465
}
466
466
_ {
467
467
warn( "malformed source json: " + src. name + " ( missing name) ") ;
@@ -471,12 +471,12 @@ fn load_one_source_package(src: source, p: map::hashmap<str, json::json>) {
471
471
472
472
let uuid = alt p. find( "uuid") {
473
473
some( json:: string( n) ) {
474
- if !is_uuid( n) {
475
- warn( "malformed source json: " + src. name + ", ' " + n + "' "+
474
+ if !is_uuid( * n) {
475
+ warn( "malformed source json: " + src. name + ", ' " + * n + "' "+
476
476
" is an invalid uuid") ;
477
477
ret;
478
478
}
479
- n
479
+ * n
480
480
}
481
481
_ {
482
482
warn( "malformed source json: " + src. name + " ( missing uuid) ") ;
@@ -485,32 +485,32 @@ fn load_one_source_package(src: source, p: map::hashmap<str, json::json>) {
485
485
} ;
486
486
487
487
let url = alt p. find( "url") {
488
- some( json:: string( n) ) { n }
488
+ some( json:: string( n) ) { * n }
489
489
_ {
490
490
warn( "malformed source json: " + src. name + " ( missing url) ") ;
491
491
ret;
492
492
}
493
493
} ;
494
494
495
495
let method = alt p. find( "method") {
496
- some( json:: string( n) ) { n }
496
+ some( json:: string( n) ) { * n }
497
497
_ {
498
498
warn( "malformed source json: " + src. name + " ( missing method) ") ;
499
499
ret;
500
500
}
501
501
} ;
502
502
503
503
let ref = alt p. find( "ref ") {
504
- some( json:: string( n) ) { some( n) }
504
+ some( json:: string( n) ) { some( * n) }
505
505
_ { none }
506
506
} ;
507
507
508
508
let mut tags = [ ] ;
509
509
alt p. find( "tags") {
510
510
some( json:: list( js) ) {
511
- for js . each { |j|
511
+ for ( * js ) . each { |j|
512
512
alt j {
513
- json:: string( j) { vec:: grow( tags, 1 u, j) ; }
513
+ json:: string( j) { vec:: grow( tags, 1 u, * j) ; }
514
514
_ { }
515
515
}
516
516
}
@@ -519,7 +519,7 @@ fn load_one_source_package(src: source, p: map::hashmap<str, json::json>) {
519
519
}
520
520
521
521
let description = alt p. find( "description") {
522
- some( json:: string( n) ) { n }
522
+ some( json:: string( n) ) { * n }
523
523
_ {
524
524
warn( "malformed source json: " + src. name
525
525
+ " ( missing description) ") ;
@@ -580,7 +580,7 @@ fn load_source_packages(c: cargo, src: source) {
580
580
let pkgstr = io:: read_whole_file_str( pkgfile) ;
581
581
alt json:: from_str( result:: get( pkgstr) ) {
582
582
ok( json:: list( js) ) {
583
- for js . each { |j|
583
+ for ( * js ) . each { |j|
584
584
alt j {
585
585
json:: dict( p) {
586
586
load_one_source_package( src, p) ;
@@ -1576,18 +1576,18 @@ fn dump_sources(c: cargo) {
1576
1576
let chash = map:: str_hash( ) ;
1577
1577
let child = json:: dict( chash) ;
1578
1578
1579
- chash. insert( "url", json:: string( v. url) ) ;
1580
- chash. insert( "method", json:: string( v. method) ) ;
1579
+ chash. insert( "url", json:: string( @ v. url) ) ;
1580
+ chash. insert( "method", json:: string( @ v. method) ) ;
1581
1581
1582
1582
alt copy v. key {
1583
1583
some( key) {
1584
- chash. insert( "key", json:: string( key) ) ;
1584
+ chash. insert( "key", json:: string( @ key) ) ;
1585
1585
}
1586
1586
_ { }
1587
1587
}
1588
1588
alt copy v. keyfp {
1589
1589
some( keyfp) {
1590
- chash. insert( "keyfp", json:: string( keyfp) ) ;
1590
+ chash. insert( "keyfp", json:: string( @ keyfp) ) ;
1591
1591
}
1592
1592
_ { }
1593
1593
}
0 commit comments