From 5827bbc1b27bb37b0a05b84ce8f61079db70d8ab Mon Sep 17 00:00:00 2001 From: Walter Bright Date: Thu, 12 Sep 2019 23:53:51 -0700 Subject: [PATCH 1/2] minfo.d is no longer throwing Errors --- src/rt/minfo.d | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rt/minfo.d b/src/rt/minfo.d index 0d5cd22b1a..62247ad95a 100644 --- a/src/rt/minfo.d +++ b/src/rt/minfo.d @@ -109,7 +109,7 @@ struct ModuleGroup // release mode. if (distance[target] != curdist) { - throw new Error("internal error printing module cycle"); + assert(0, "internal error printing module cycle"); } // determine the path. This is tricky, because we have to @@ -196,7 +196,7 @@ struct ModuleGroup break; default: // invalid cycle handling option. - throw new Error("DRT invalid cycle handling option: " ~ cycleHandling); + assert(0, "DRT invalid cycle handling option: " ~ cycleHandling); } debug (printModuleDependencies) @@ -368,7 +368,8 @@ struct ModuleGroup string errmsg = ""; buildCycleMessage(idx, midx, (string x) {errmsg ~= x;}); - throw new Error(errmsg, __FILE__, __LINE__); + assert(0, errmsg); + case ignore: break; case print: From 88d0a42d38a9c63251d11244697b7b4d931a13f9 Mon Sep 17 00:00:00 2001 From: RazvanN7 Date: Fri, 6 May 2022 15:33:33 +0300 Subject: [PATCH 2/2] Fix test/cycles/Makefile --- test/cycles/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cycles/Makefile b/test/cycles/Makefile index 4052695073..78c64c0173 100644 --- a/test/cycles/Makefile +++ b/test/cycles/Makefile @@ -10,7 +10,7 @@ all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS))) $(ROOT)/cycle_ignore.done: RETCODE=0 $(ROOT)/cycle_ignore.done: LINES=0 -$(ROOT)/cycle_abort.done: RETCODE=1 +$(ROOT)/cycle_abort.done: RETCODE=4 $(ROOT)/cycle_abort.done: LINES=7 $(ROOT)/cycle_print.done: RETCODE=0 $(ROOT)/cycle_print.done: LINES=6