Skip to content

fix Issue 17512 - [REG 2.073] [DIP1000] Error on bad interplay of 'au…#8001

Merged
wilzbach merged 1 commit intodlang:stablefrom
WalterBright:fix17512
Mar 12, 2018
Merged

fix Issue 17512 - [REG 2.073] [DIP1000] Error on bad interplay of 'au…#8001
wilzbach merged 1 commit intodlang:stablefrom
WalterBright:fix17512

Conversation

@WalterBright
Copy link
Copy Markdown
Member

…to ref' and 'return' attribute deduction

@dlang-bot
Copy link
Copy Markdown
Contributor

dlang-bot commented Mar 11, 2018

Thanks for your pull request, @WalterBright!

Bugzilla references

Auto-close Bugzilla Severity Description
17512 regression [REG 2.073] [DIP1000] Error on bad interplay of 'auto ref' and 'return' attribute deduction.

@wilzbach wilzbach changed the base branch from master to stable March 11, 2018 17:27
@wilzbach
Copy link
Copy Markdown
Contributor

(rebased to stable)

Copy link
Copy Markdown
Contributor

@wilzbach wilzbach left a comment

Choose a reason for hiding this comment

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

LGTM though it feels like this is a bit of a workaround against the fact that return is added somewhere in DMD before.

@wilzbach
Copy link
Copy Markdown
Contributor

wilzbach commented Mar 11, 2018

DAutoTest failure is unrelated and would need dlang/dlang.org#2270

@WalterBright
Copy link
Copy Markdown
Member Author

oh gawd, not again

@WalterBright
Copy link
Copy Markdown
Member Author

Abandoning this mess.

@wilzbach
Copy link
Copy Markdown
Contributor

wilzbach commented Mar 11, 2018

oh gawd, not again

Did you force-push?

@wilzbach wilzbach reopened this Mar 11, 2018
@WalterBright
Copy link
Copy Markdown
Member Author

I redid it as #8006

@wilzbach
Copy link
Copy Markdown
Contributor

Abandoning this mess.

Just fixed it for you. Just do a git pull if other people made changes to your PR.
In this case it was just git rebase --onto upstream/stable upstream/master

@WalterBright
Copy link
Copy Markdown
Member Author

Thanks! In that case, I'll turn on automerge before any more changes bork it again.

@wilzbach
Copy link
Copy Markdown
Contributor

before any more changes bork it again.

For the future, if someone else force-pushed onto your branch, you need to reset your local branch to it before adding changes as otherwise the previous work will be overwritten.
In short: there's e.g. git pull -f to reset you branch to the remote state.

@WalterBright
Copy link
Copy Markdown
Member Author

The failing win64 test looks spurious, I deprecated the test, but it won't rerun it.

@rainers
Copy link
Copy Markdown
Member

rainers commented Mar 12, 2018

The failing win64 test looks spurious, I deprecated the test, but it won't rerun it.

Looks like @braddr is in the middle of updating the build servers. It is trying to compile with VC2010.

@wilzbach
Copy link
Copy Markdown
Contributor

I deprecated the test, but it won't rerun it.

I tried to deprecate it too for a few times and auto-tester seems to remove the deleted status ...

Looks like @braddr is in the middle of updating the build servers. It is trying to compile with VC2010.

The machine is broken since almost two weeks: braddr/d-tester#71

@wilzbach wilzbach merged commit abd5267 into dlang:stable Mar 12, 2018
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.

4 participants