Skip to content

Comments

Fix #1037#1154

Closed
WebFreak001 wants to merge 5 commits intodlang:masterfrom
WebFreak001:fix-1037
Closed

Fix #1037#1154
WebFreak001 wants to merge 5 commits intodlang:masterfrom
WebFreak001:fix-1037

Conversation

@WebFreak001
Copy link
Member

I grouped the arrays all_configs and any_config together into one struct for better maintainability and readability (and eventual segfaults where the index hasn't been checked)

Previously it only showed

Root package issue1037-better-dependency-messages reference gitcompatibledubpackage 1.0.1 cannot be satisfied.

Now it additionally shows

Packages causing the conflict:
	issue1037-better-dependency-messages depends on 1.0.1
	b depends on ~>1.0.2

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 61.62% when pulling 020bc66 on WebFreak001:fix-1037 into 13581f8 on dlang:master.

@WebFreak001
Copy link
Member Author

I don't get why it complains about logError in the travis build (a shell function I'm not even using) missing and why it even randomly broke there on these old compilers

@s-ludwig
Copy link
Member

"logError" is called from "die" - my guess would be that the export for that is missing in "run-unittest.sh". But it's strange that this gets called at all, since the diff looks identical.

Copy link
Member

@s-ludwig s-ludwig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from the stylistic nitpicks, the changes look good!

Have you tried running the added test case locally with an old compiler version? The diff output looks identical, and I thought that GitHub would mark any non-Linux line endings, so it's hard to tell from the distance what goes wrong there.

When the issues are resolved, this should also be rebased once before the merge.

}
}

static struct ConfigEntry
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be private

}

CONFIG[] all_configs;
bool any_config;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naming convention: allConfigs, anyConfig.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I adapted to the original naming conventions of the file which used exactly such names

Root package issue1037-better-dependency-messages reference gitcompatibledubpackage 1.0.1 cannot be satisfied.
Packages causing the conflict:
issue1037-better-dependency-messages depends on 1.0.1
b depends on ~>1.0.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For better clarity of the "test" folder, this should be named "issue1037-expected-output".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but all the other 'expected output files' are also named this way, it would be weird to only name this one like that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed that. I'll change those too then.

@dlang-bot
Copy link
Collaborator

Thanks for your pull request, @WebFreak001! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.

Some tips to help speed things up:

  • smaller, focused PRs are easier to review than big ones

  • try not to mix up refactoring or style changes with bug fixes or feature enhancements

  • provide helpful commit messages explaining the rationale behind each change

Bear in mind that large or tricky changes may require multiple rounds of review and revision.

Please see CONTRIBUTING.md for more information.

@timotheecour
Copy link

ping on this? issue #1037 keeps popping up

@WebFreak001
Copy link
Member Author

ping x10

@timotheecour
Copy link

@WebFreak001 I just msged you on slack

@timotheecour
Copy link

@WebFreak001 i just rebased yours against master in #1377
can we get 1154 or 1377 merged in master? this is a big improvement

@WebFreak001
Copy link
Member Author

got merged in #1377

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants