diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-09-02 04:59:51 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-09-02 05:00:42 -0400 |
| commit | 67a8ea521a81bbc7e2cab893d778eaaa8d34bb6c (patch) | |
| tree | ef5b5cb124a438fade76210d15677c0190761233 | |
| parent | 331d2d6d31e1c7925c23f5173e5fbbb61f8b3e91 (diff) | |
| download | rust-67a8ea521a81bbc7e2cab893d778eaaa8d34bb6c.tar.gz rust-67a8ea521a81bbc7e2cab893d778eaaa8d34bb6c.zip | |
switch __field__ hack to <unnamed_field>
avoids conflict with fields actually named `__field__`
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 | ||||
| -rw-r--r-- | src/test/debug-info/tuple-struct.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 3d47b1141dd..c9d61be6b0e 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -436,7 +436,7 @@ fn mk_fresh_ident_interner() -> @ident_interner { "blk", // 26 "static", // 27 "__foreign_mod__", // 28 - "__field__", // 29 + "<unnamed_field>", // 29 "C", // 30 "Self", // 31 diff --git a/src/test/debug-info/tuple-struct.rs b/src/test/debug-info/tuple-struct.rs index 1368053f48c..762b8dcb38f 100644 --- a/src/test/debug-info/tuple-struct.rs +++ b/src/test/debug-info/tuple-struct.rs @@ -34,7 +34,8 @@ // This test case mainly makes sure that no field names are generated for tuple structs (as opposed -// to all fields having the name "__field__"). Otherwise they are handled the same a normal structs. +// to all fields having the name "<unnamed_field>"). Otherwise they are handled the same a normal +// structs. struct NoPadding16(u16, i16); struct NoPadding32(i32, f32, u32); |