Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement move constructor #16876

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Conversation

WalterBright
Copy link
Member

@WalterBright WalterBright added Enhancement WIP Work In Progress - not ready for review or pulling labels Sep 24, 2024
@dlang-bot
Copy link
Contributor

Thanks for your pull request, @WalterBright!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "master + dmd#16876"

@thewilsonator thewilsonator added Needs Changelog A changelog entry needs to be added to /changelog Pending DIP Approval Needs Spec PR A PR updating the language specification needs to be submitted to dlang.org Needs Tests New Language Feature labels Sep 24, 2024
@WalterBright WalterBright mentioned this pull request Sep 26, 2024
@thewilsonator thewilsonator marked this pull request as draft September 29, 2024 05:06
@WalterBright
Copy link
Member Author

Oh bother. The current crashes are because of a bad merge.

compiler/src/dmd/parse.d Show resolved Hide resolved
@WalterBright
Copy link
Member Author

What is that osthread.d change doing there? I didn't change it. How do I get back my work before the rebase?

@tgehr
Copy link
Contributor

tgehr commented Oct 3, 2024

What is that osthread.d change doing there? I didn't change it. How do I get back my work before the rebase?

You can access it via git reflog. Then use git reset --hard with the corresponding reference to put your branch back into that state (though make sure there are no local changes, they will be deleted).

@WalterBright
Copy link
Member Author

@tgehr can you please show me exactly what to type in? i.e. "the corresponding reference"

@tgehr
Copy link
Contributor

tgehr commented Oct 3, 2024

@tgehr can you please show me exactly what to type in? i.e. "the corresponding reference"

Well it depends on the output of the first command, but let's look at an example on my unpacking branch:

$ git reflog
e5cfcd6303 (HEAD -> unpacking, github/unpacking) HEAD@{0}: rebase (continue) (finish): returning to refs/heads/unpacking
e5cfcd6303 (HEAD -> unpacking, github/unpacking) HEAD@{1}: rebase (continue) (pick): Semantic analysis for UnpackDeclaration in function literal parameter.
165cc88bbb HEAD@{2}: rebase (continue) (pick): Parse UnpackDeclaration as a function literal parameter.
357d937fa7 HEAD@{3}: rebase (continue) (pick): Semantic analysis for UnpackDeclaration in foreach variable.
ca5f01488d HEAD@{4}: rebase (continue) (pick): Parse UnpackDeclaration as foreach variable.
30c48372d5 HEAD@{5}: rebase (continue) (pick): Add UnpackDeclaration to Parameter.
0f64876bb5 HEAD@{6}: rebase (continue): Semantic analysis for UnpackDeclaration.
59856c21e7 HEAD@{7}: rebase: fast-forward
08581d3625 HEAD@{8}: rebase (start): checkout master
27cb7dba80 HEAD@{9}: pull github unpacking: Fast-forward
...

The commit before rebase is the one below the one with rebase (start). Its reference is either 27cb7dba80 or HEAD@{9}, both work.

Therefore, to undo my last git rebase master, I would have to do:

git reset --hard 27cb7dba80 

or, alternatively:

git reset --hard HEAD@{9}

@WalterBright
Copy link
Member Author

@tgehr thanks! Will give it a go.

@WalterBright
Copy link
Member Author

I've got it back! Yay! Thanks, @tgehr

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Needs Changelog A changelog entry needs to be added to /changelog Needs Spec PR A PR updating the language specification needs to be submitted to dlang.org Needs Tests New Language Feature Pending DIP Approval WIP Work In Progress - not ready for review or pulling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants