@@ -60,12 +60,12 @@ fn rust_type_id(ctx: &mut GenCtx, name: &str) -> String {
6060 }
6161}
6262
63- fn unnamed_name ( ctx : & mut GenCtx , name : String ) -> String {
63+ fn unnamed_name ( ctx : & mut GenCtx , name : & str ) -> String {
6464 if name. is_empty ( ) {
6565 ctx. unnamed_ty += 1 ;
6666 format ! ( "Unnamed{}" , ctx. unnamed_ty)
6767 } else {
68- name
68+ name. into ( )
6969 }
7070}
7171
@@ -167,15 +167,15 @@ pub fn gen_mod(
167167 GCompDecl ( ci) => {
168168 {
169169 let mut c = ci. borrow_mut ( ) ;
170- c. name = unnamed_name ( & mut ctx, c. name . clone ( ) ) ;
170+ c. name = unnamed_name ( & mut ctx, & c. name ) ;
171171 }
172172 let c = ci. borrow ( ) . clone ( ) ;
173173 defs. push ( opaque_to_rs ( & mut ctx, comp_name ( c. kind , & c. name ) ) ) ;
174174 } ,
175175 GComp ( ci) => {
176176 {
177177 let mut c = ci. borrow_mut ( ) ;
178- c. name = unnamed_name ( & mut ctx, c. name . clone ( ) ) ;
178+ c. name = unnamed_name ( & mut ctx, & c. name ) ;
179179 }
180180 let c = ci. borrow ( ) . clone ( ) ;
181181 defs. extend ( comp_to_rs ( & mut ctx, c. kind , comp_name ( c. kind , & c. name ) ,
@@ -185,15 +185,15 @@ pub fn gen_mod(
185185 GEnumDecl ( ei) => {
186186 {
187187 let mut e = ei. borrow_mut ( ) ;
188- e. name = unnamed_name ( & mut ctx, e. name . clone ( ) ) ;
188+ e. name = unnamed_name ( & mut ctx, & e. name ) ;
189189 }
190190 let e = ei. borrow ( ) . clone ( ) ;
191191 defs. push ( opaque_to_rs ( & mut ctx, enum_name ( & e. name ) ) ) ;
192192 } ,
193193 GEnum ( ei) => {
194194 {
195195 let mut e = ei. borrow_mut ( ) ;
196- e. name = unnamed_name ( & mut ctx, e. name . clone ( ) ) ;
196+ e. name = unnamed_name ( & mut ctx, & e. name ) ;
197197 }
198198 let e = ei. borrow ( ) ;
199199 defs. extend ( cenum_to_rs (
@@ -1200,12 +1200,12 @@ fn cty_to_rs(ctx: &mut GenCtx, ty: &Type) -> ast::Ty {
12001200 } ,
12011201 TComp ( ref ci) => {
12021202 let mut c = ci. borrow_mut ( ) ;
1203- c. name = unnamed_name ( ctx, c. name . clone ( ) ) ;
1203+ c. name = unnamed_name ( ctx, & c. name ) ;
12041204 mk_ty ( ctx, false , vec ! ( comp_name( c. kind, & c. name) ) )
12051205 } ,
12061206 TEnum ( ref ei) => {
12071207 let mut e = ei. borrow_mut ( ) ;
1208- e. name = unnamed_name ( ctx, e. name . clone ( ) ) ;
1208+ e. name = unnamed_name ( ctx, & e. name ) ;
12091209 mk_ty ( ctx, false , vec ! ( enum_name( & e. name) ) )
12101210 }
12111211 }
0 commit comments