@@ -261,21 +261,15 @@ impl Type {
261
261
match self . kind {
262
262
TypeKind :: Named => {
263
263
let name = self . name ( ) . expect ( "Unnamed named type?" ) ;
264
- !Self :: is_valid_identifier ( & name)
264
+ !clang :: is_valid_identifier ( & name)
265
265
}
266
266
_ => false ,
267
267
}
268
268
}
269
269
270
- /// Checks whether the name looks like an identifier,
271
- /// i.e. is alphanumeric (including '_') and does not start with a digit.
272
- fn is_valid_identifier ( name : & str ) -> bool {
273
- clang:: is_valid_identifier ( name)
274
- }
275
-
276
270
/// Takes `name`, and returns a suitable identifier representation for it.
277
271
fn sanitize_name < ' a > ( name : & ' a str ) -> Cow < ' a , str > {
278
- if Self :: is_valid_identifier ( name) {
272
+ if clang :: is_valid_identifier ( name) {
279
273
return Cow :: Borrowed ( name)
280
274
}
281
275
@@ -1112,7 +1106,7 @@ impl Type {
1112
1106
1113
1107
if name. is_empty ( ) {
1114
1108
let pretty_name = ty. spelling ( ) ;
1115
- if Self :: is_valid_identifier ( & pretty_name) {
1109
+ if clang :: is_valid_identifier ( & pretty_name) {
1116
1110
name = pretty_name;
1117
1111
}
1118
1112
}
@@ -1130,7 +1124,7 @@ impl Type {
1130
1124
// The pretty-printed name may contain typedefed name,
1131
1125
// but may also be "struct (anonymous at .h:1)"
1132
1126
let pretty_name = ty. spelling ( ) ;
1133
- if Self :: is_valid_identifier ( & pretty_name) {
1127
+ if clang :: is_valid_identifier ( & pretty_name) {
1134
1128
name = pretty_name;
1135
1129
}
1136
1130
}
0 commit comments