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

Move vmspace into common plan #79

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Move vmspace into common plan #79

merged 1 commit into from
Apr 17, 2020

Conversation

steveblackburn
Copy link
Contributor

This is the first step in a process of moving common functions out of the concrete plans.

@steveblackburn steveblackburn force-pushed the pr-movevmspace branch 11 times, most recently from aaac380 to 7c55011 Compare April 16, 2020 07:44
Copy link
Member

@qinsoon qinsoon left a comment

Choose a reason for hiding this comment

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

This PR looks good and makes it quite clear what is specific to a plan and what is common. But we need to include builds and checks for the newly added vmspace feature, and fix any new issues raised by those checks. I will look at this PR again when the issues are fixed, just in case there is any major change.

@@ -30,6 +30,7 @@ nogc = ["immortalspace", "largeobjectspace"]
semispace = ["immortalspace", "largeobjectspace", "copyspace"]

# spaces
vmspace = []
Copy link
Member

Choose a reason for hiding this comment

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

We need to include builds and style checks for the vmspace feature.

Can you add the following lines to our CI script?

.github/scripts/ci-build.sh:

cargo build --features nogc,vmspace
cargo build --features semispace,vmspace

.github/scripts/ci-style.sh:

cargo clippy --features nogc,vmspace
cargo clippy --features semispace,vmspace

And very possibly, you would need to fix the issues raised from those checks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do.

Copy link
Contributor Author

@steveblackburn steveblackburn Apr 17, 2020

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@steveblackburn steveblackburn Apr 17, 2020

Choose a reason for hiding this comment

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

No wait.... My mistake. I did not properly push my changes. Trying again now. Sorry for the false alarm. Still getting used to this workflow.

Copy link
Member

Choose a reason for hiding this comment

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

Some part of the UI is confused because there were forced pushes and it cannot find the old commits anymore

Copy link
Member

Choose a reason for hiding this comment

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

Ah OK. Then there's no need to do forced push. When you merge, you can use squash and merge, which results in only a single commit to master

Copy link
Member

Choose a reason for hiding this comment

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

When you use forced push, it's harder to see the changes. For example, when you sent a link of one of the files for the unused_mut problem yesterday, I clicked the link and couldn't find the line you were referring to because the link pointed to a newer version of the file.

Copy link
Member

Choose a reason for hiding this comment

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

I believe squash merge results in a singled commit that is authored by the person who pressed the merge button. Only in the comment it says it is co-authored the actual person who wrote the code. Otherwise I suggest we always use squash merge. We should test if this is true.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK. For my next PR, we can try this. I'll use multiple commits, and Yi can merge it. Should be later today.

Copy link
Member

Choose a reason for hiding this comment

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

I just did some search and we might need to think about what workflow works better for us.
See isaacs/github#997 for example.

src/plan/plan.rs Show resolved Hide resolved
src/plan/plan.rs Show resolved Hide resolved
src/plan/plan.rs Show resolved Hide resolved
@steveblackburn steveblackburn merged commit 6c19e87 into master Apr 17, 2020
@steveblackburn steveblackburn deleted the pr-movevmspace branch April 17, 2020 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-approved Pull request approved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants