@@ -56,7 +56,7 @@ fn empty_generics() -> ast::Generics {
56
56
fn rust_id ( ctx : & mut GenCtx , name : ~str ) -> ( ~str , bool ) {
57
57
let token = parse:: token:: IDENT ( ctx. ext_cx . ident_of ( name) , false ) ;
58
58
if parse:: token:: is_any_keyword ( & token) || "bool" == name {
59
- ( ~ "_" + name, true )
59
+ ( "_" . to_owned ( ) + name, true )
60
60
} else {
61
61
( name, false )
62
62
}
@@ -77,7 +77,7 @@ fn rust_type_id(ctx: &mut GenCtx, name: ~str) -> ~str {
77
77
"i64" == name ||
78
78
"Self" == name ||
79
79
"str" == name {
80
- ~ "_" + name
80
+ "_" . to_owned ( ) + name
81
81
} else {
82
82
let ( n, _) = rust_id ( ctx, name) ;
83
83
n
@@ -134,7 +134,7 @@ pub fn gen_rs(out: ~io::Writer, abi: ~str, link: &Option<~str>, globs: Vec<Globa
134
134
} ;
135
135
ctx. ext_cx . bt_push ( ExpnInfo {
136
136
call_site : DUMMY_SP ,
137
- callee : NameAndSpan { name: ~"" , format : MacroBang , span : None }
137
+ callee : NameAndSpan { name : "" . to_owned ( ) , format : MacroBang , span : None }
138
138
} ) ;
139
139
let uniq_globs = tag_dup_decl ( globs) ;
140
140
@@ -214,7 +214,7 @@ pub fn gen_rs(out: ~io::Writer, abi: ~str, link: &Option<~str>, globs: Vec<Globa
214
214
let v = vi. borrow ( ) ;
215
215
cvar_to_rs ( & mut ctx, v. name . clone ( ) , & v. ty , v. is_const )
216
216
} ,
217
- _ => { fail ! ( ~ "generate global variables") }
217
+ _ => { fail ! ( "generate global variables" . to_owned ( ) ) }
218
218
}
219
219
} ) . collect ( ) ;
220
220
@@ -225,14 +225,14 @@ pub fn gen_rs(out: ~io::Writer, abi: ~str, link: &Option<~str>, globs: Vec<Globa
225
225
match v. ty {
226
226
TFunc ( ref rty, ref aty, var) => cfunc_to_rs ( & mut ctx, v. name . clone ( ) ,
227
227
* rty, * aty, var) ,
228
- _ => { fail!(~ " generate functions") }
228
+ _ => { fail ! ( "generate functions" . to_owned ( ) ) }
229
229
}
230
230
} ,
231
- _ => { fail!(~ " generate functions") }
231
+ _ => { fail ! ( "generate functions" . to_owned ( ) ) }
232
232
}
233
233
} ) . collect ( ) ;
234
234
235
- let views = Vec::from_elem(1, mk_import(&mut ctx, &[~ " libc"]));
235
+ let views = Vec :: from_elem ( 1 , mk_import ( & mut ctx, & [ "libc" . to_owned ( ) ] ) ) ;
236
236
defs. push ( mk_extern ( & mut ctx, link, vars, funcs) ) ;
237
237
238
238
let crate_ = ast:: Crate {
@@ -292,7 +292,7 @@ fn mk_extern(ctx: &mut GenCtx, link: &Option<~str>,
292
292
None => attrs = Vec :: new ( ) ,
293
293
Some ( ref l) => {
294
294
let link_name = @dummy_spanned ( ast:: MetaNameValue (
295
- to_intern_str( ctx, ~ "name") ,
295
+ to_intern_str ( ctx, "name" . to_owned ( ) ) ,
296
296
dummy_spanned ( ast:: LitStr (
297
297
to_intern_str ( ctx, l. to_owned ( ) ) ,
298
298
ast:: CookedStr
@@ -301,7 +301,7 @@ fn mk_extern(ctx: &mut GenCtx, link: &Option<~str>,
301
301
let link_args = dummy_spanned ( ast:: Attribute_ {
302
302
style : ast:: AttrOuter ,
303
303
value : @dummy_spanned ( ast:: MetaList (
304
- to_intern_str( ctx, ~ "link") ,
304
+ to_intern_str ( ctx, "link" . to_owned ( ) ) ,
305
305
Vec :: from_elem ( 1 , link_name) )
306
306
) ,
307
307
is_sugared_doc : false
@@ -623,7 +623,7 @@ fn cunion_to_rs(ctx: &mut GenCtx, name: ~str, layout: Layout, fields: Vec<FieldI
623
623
624
624
return vec ! (
625
625
union_def,
626
- mk_item( ctx, ~"" , methods, ast:: Inherited )
626
+ mk_item( ctx, "" . to_owned ( ) , methods, ast:: Inherited )
627
627
) ;
628
628
}
629
629
@@ -663,7 +663,7 @@ fn mk_link_name_attr(ctx: &mut GenCtx, name: ~str) -> ast::Attribute {
663
663
ast:: CookedStr
664
664
) ) ;
665
665
let attr_val = @dummy_spanned ( ast:: MetaNameValue (
666
- to_intern_str ( ctx, ~ "link_name") , lit
666
+ to_intern_str ( ctx, "link_name" . to_owned ( ) ) , lit
667
667
) ) ;
668
668
let attr = ast:: Attribute_ {
669
669
style : ast:: AttrOuter ,
@@ -782,23 +782,23 @@ fn cfunc_to_rs(ctx: &mut GenCtx, name: ~str, rty: &Type,
782
782
783
783
fn cty_to_rs ( ctx : & mut GenCtx , ty : & Type ) -> ast:: Ty {
784
784
return match * ty {
785
- TVoid => mk_ty ( ctx, ~ "c_void") ,
785
+ TVoid => mk_ty ( ctx, "c_void" . to_owned ( ) ) ,
786
786
TInt ( i, _) => match i {
787
- IBool => mk_ty ( ctx, ~ "c_int") ,
788
- ISChar => mk_ty ( ctx, ~ "c_char") ,
789
- IUChar => mk_ty ( ctx, ~ "c_uchar") ,
790
- IInt => mk_ty ( ctx, ~ "c_int") ,
791
- IUInt => mk_ty ( ctx, ~ "c_uint") ,
792
- IShort => mk_ty ( ctx, ~ "c_short") ,
793
- IUShort => mk_ty ( ctx, ~ "c_ushort") ,
794
- ILong => mk_ty ( ctx, ~ "c_long") ,
795
- IULong => mk_ty ( ctx, ~ "c_ulong") ,
796
- ILongLong => mk_ty ( ctx, ~ "c_longlong") ,
797
- IULongLong => mk_ty ( ctx, ~ "c_ulonglong")
787
+ IBool => mk_ty ( ctx, "c_int" . to_owned ( ) ) ,
788
+ ISChar => mk_ty ( ctx, "c_char" . to_owned ( ) ) ,
789
+ IUChar => mk_ty ( ctx, "c_uchar" . to_owned ( ) ) ,
790
+ IInt => mk_ty ( ctx, "c_int" . to_owned ( ) ) ,
791
+ IUInt => mk_ty ( ctx, "c_uint" . to_owned ( ) ) ,
792
+ IShort => mk_ty ( ctx, "c_short" . to_owned ( ) ) ,
793
+ IUShort => mk_ty ( ctx, "c_ushort" . to_owned ( ) ) ,
794
+ ILong => mk_ty ( ctx, "c_long" . to_owned ( ) ) ,
795
+ IULong => mk_ty ( ctx, "c_ulong" . to_owned ( ) ) ,
796
+ ILongLong => mk_ty ( ctx, "c_longlong" . to_owned ( ) ) ,
797
+ IULongLong => mk_ty ( ctx, "c_ulonglong" . to_owned ( ) )
798
798
} ,
799
799
TFloat ( f, _) => match f {
800
- FFloat => mk_ty ( ctx, ~ "c_float") ,
801
- FDouble => mk_ty ( ctx, ~ "c_double")
800
+ FFloat => mk_ty ( ctx, "c_float" . to_owned ( ) ) ,
801
+ FDouble => mk_ty ( ctx, "c_double" . to_owned ( ) )
802
802
} ,
803
803
TPtr ( ref t, is_const, _) => {
804
804
let id = cty_to_rs ( ctx, * t) ;
0 commit comments