Skip to content

Commit

Permalink
[minor cleanups]
Browse files Browse the repository at this point in the history
  • Loading branch information
kinke committed Jul 14, 2022
1 parent b8f4985 commit 77ad7e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/reggae/dub/interop/dublib.d
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct Dub {
// add the special `dub test` configuration (which doesn't require an existing `unittest` config)
const testConfig = (allConfigs || singleConfig == "unittest")
? _project.addTestRunnerConfiguration(settings)
: null;
: null; // skip when requesting a single non-unittest config
const haveSpecialTestConfig = testConfig.length && testConfig != "unittest";

if (!allConfigs) {
Expand Down
5 changes: 2 additions & 3 deletions src/reggae/dub/interop/package.d
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private from!"reggae.dub.info".DubInfo getDubInfo

auto settings = dub.getGeneratorSettings(options);
const configs = dubConfigurations(output, dub, options, settings);
const haveTestConfig = configs.test.length != 0;
const haveTestConfig = configs.test != "";
bool atLeastOneConfigOk;
Exception dubInfoFailure;

Expand All @@ -127,7 +127,7 @@ private from!"reggae.dub.info".DubInfo getDubInfo
gDubInfos["default"] = gDubInfos[configs.default_];

// (additionally) expose the special `dub test` config as `unittest` config in the DSL (`configToDubInfo`)
// (`dubTestTarget!()`, `dubConfigurationTarget!(Configuration("unittest"))` etc.)
// (for `dubTestTarget!()`, `dubConfigurationTarget!(Configuration("unittest"))` etc.)
if(haveTestConfig && configs.test != "unittest" && configs.test in gDubInfos)
gDubInfos["unittest"] = gDubInfos[configs.test];
}
Expand All @@ -145,7 +145,6 @@ dubConfigurations
{
import reggae.dub.interop.configurations: DubConfigurations;
import reggae.io: log;
import std.exception: enforce;

const allConfigs = options.dubConfig == "";

Expand Down

0 comments on commit 77ad7e4

Please sign in to comment.