diff options
| author | Manish Goregaokar <manish@mozilla.com> | 2016-06-27 21:16:59 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manish@mozilla.com> | 2016-06-27 22:19:42 +0530 |
| commit | 921d8f549f9e35d3f83c7b1a381146a7dc1246f4 (patch) | |
| tree | 362a359483a10ddf87a0d47243c4e761e8f15fac /gdb/rust-lang.c | |
| parent | 45a54ee57764e34fe2fe8b7655fabef38936a696 (diff) | |
| download | gdb-921d8f549f9e35d3f83c7b1a381146a7dc1246f4.zip gdb-921d8f549f9e35d3f83c7b1a381146a7dc1246f4.tar.gz gdb-921d8f549f9e35d3f83c7b1a381146a7dc1246f4.tar.bz2 | |
Print void types correctly in Rust
Rust prefers to not specify the return type of a function when it is unit
(`()`). The type is also referred to as "void" in debuginfo but not in actual
usage, so we should never be printing "void" when the language is Rust.
2016-06-27 Manish Goregaokar <manish@mozilla.com>
gdb/ChangeLog:
* rust-lang.c (rust_print_type): Print unit types as "()"
* rust-lang.c (rust_print_type): Omit return type for functions
returning unit
gdb/testsuite/ChangeLog:
* gdb.rust/simple.rs: Add test for returning unit in a function
* gdb.rust/simple.exp: Add expectation for functions returning unit
Diffstat (limited to 'gdb/rust-lang.c')
| -rw-r--r-- | gdb/rust-lang.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 0c56a0f..23ddd5a 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -446,7 +446,7 @@ static const struct generic_val_print_decorations rust_decorations = " * I", "true", "false", - "void", + "()", "[", "]" }; @@ -729,13 +729,22 @@ rust_print_type (struct type *type, const char *varstring, if (show <= 0 && TYPE_NAME (type) != NULL) { - fputs_filtered (TYPE_NAME (type), stream); + /* Rust calls the unit type "void" in its debuginfo, + but we don't want to print it as that. */ + if (TYPE_CODE (type) == TYPE_CODE_VOID) + fputs_filtered ("()", stream); + else + fputs_filtered (TYPE_NAME (type), stream); return; } type = check_typedef (type); switch (TYPE_CODE (type)) { + case TYPE_CODE_VOID: + fputs_filtered ("()", stream); + break; + case TYPE_CODE_FUNC: /* Delegate varargs to the C printer. */ if (TYPE_VARARGS (type)) @@ -753,8 +762,13 @@ rust_print_type (struct type *type, const char *varstring, rust_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags); } - fputs_filtered (") -> ", stream); - rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags); + fputs_filtered (")", stream); + /* If it returns unit, we can omit the return type. */ + if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) + { + fputs_filtered (" -> ", stream); + rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags); + } break; case TYPE_CODE_ARRAY: |