Skip to content

/ servo

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

Fix `--layout-threads 1` in layout 2020 #25230

Merged
merged 3 commits into from Dec 11, 2019
Merged

Fix `--layout-threads 1` in layout 2020 #25230

merged 3 commits into from Dec 11, 2019

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Dec 10, 2019

No description provided.

@SimonSapin SimonSapin added this to In progress in Layout 2020 via automation Dec 10, 2019
@highfive
Copy link

highfive commented Dec 10, 2019

Heads up! This PR modifies the following files:

  • @emilio: components/style/values/specified/box.rs
@highfive
Copy link

highfive commented Dec 10, 2019

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 10, 2019

@bors-servo r=nox
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

📌 Commit 683c762 has been approved by nox
@highfive highfive assigned nox and unassigned asajeffrey Dec 10, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

☔ The latest upstream changes (presumably #25207) made this pull request unmergeable. Please resolve the merge conflicts.
SimonSapin added 3 commits Dec 8, 2019
@SimonSapin
Disable in Layout 2020 an assertion that does not apply there
d717382
@SimonSapin
Support STYLO_THREADS=1
aade603
@SimonSapin
Disable use of rayon with `--layout-threads 1` instead of panicking
Loading status checks…
c895e3d
@SimonSapin SimonSapin force-pushed the sequential branch from 683c762 to c895e3d Dec 10, 2019
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 10, 2019

@bors-servo r=nox
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2019

📌 Commit c895e3d has been approved by nox
bors-servo added a commit that referenced this pull request Dec 11, 2019
@bors-servo
Auto merge of #25230 - servo:sequential, r=nox
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b98a8fc 
Fix `--layout-threads 1` in layout 2020
@bors-servo
Copy link
Contributor

bors-servo commented Dec 11, 2019

⌛ Testing commit c895e3d with merge b98a8fc...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 11, 2019

☀️ Test successful - status-taskcluster
Approved by: nox
Pushing b98a8fc to master...
@bors-servo bors-servo merged commit c895e3d into master Dec 11, 2019
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
Layout 2020 automation moved this from In progress to Merged / resolved Dec 11, 2019
@bors-servo bors-servo deleted the sequential branch Dec 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
A-layout/2020
Projects
Layout 2020
  
Merged / resolved
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@SimonSapin @highfive @bors-servo @nox @asajeffrey
You can’t perform that action at this time.