about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-05-07 17:58:55 +0200
committerGitHub <noreply@github.com>2020-05-07 17:58:55 +0200
commit9e4a745b8dfa2188e9dcbfc58ac8e4cd25537cde (patch)
tree35a94c773e9887c4dec6fdf7fefe884442fa4d29
parent480f7181589192bf52a15e8bbbb684c6a485fa2c (diff)
parent8e76663ed1983c4182a6e6a09dbc9c085ee56bd5 (diff)
downloadrust-9e4a745b8dfa2188e9dcbfc58ac8e4cd25537cde.tar.gz
rust-9e4a745b8dfa2188e9dcbfc58ac8e4cd25537cde.zip
Rollup merge of #71959 - petrochenkov:chelpers, r=Mark-Simulacrum
tests: Fix warnings in `rust_test_helpers.c`

MSVC is silly and doesn't recognize `assert` as diverging.
-rw-r--r--src/test/auxiliary/rust_test_helpers.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/auxiliary/rust_test_helpers.c b/src/test/auxiliary/rust_test_helpers.c
index 897c940149b..92b7dd4b7c5 100644
--- a/src/test/auxiliary/rust_test_helpers.c
+++ b/src/test/auxiliary/rust_test_helpers.c
@@ -368,6 +368,7 @@ rust_dbg_unpack_option_u64(struct U8TaggedEnumOptionU64 o, uint64_t *into) {
         return 0;
     default:
         assert(0 && "unexpected tag");
+        return 0;
     }
 }
 
@@ -411,5 +412,6 @@ rust_dbg_unpack_option_u64u64(struct U8TaggedEnumOptionU64U64 o, uint64_t *a, ui
         return 0;
     default:
         assert(0 && "unexpected tag");
+        return 0;
     }
 }