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

Make tidy check for "*" in toml files #6648

Merged
merged 2 commits into from Jul 20, 2015
Merged

Conversation

@boghison
Copy link
Contributor

boghison commented Jul 16, 2015

This checks every .toml file for an asterisk and prints an error if found.

Review on Reviewable

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 16, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5576

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@boghison
Copy link
Contributor Author

boghison commented Jul 16, 2015

You guys are gonna have to guide me through updating the versions

@jdm
Copy link
Member

jdm commented Jul 16, 2015

@boghison You can use the Cargo.lock file as a guide - take the current A.B.C version for each matching package, and replace the "*" with "A.B".

@boghison
Copy link
Contributor Author

boghison commented Jul 16, 2015

Hmm, I am getting these errors:
"error: no method named fmt found for type logical_geometry::WritingMode in the current scope" in components/util/logical_geometry.rs:170
and "the trait core::fmt::Debug is not implemented for the type task_state::TaskState " in components/util/task_state.rs:60.

@boghison
Copy link
Contributor Author

boghison commented Jul 17, 2015

Oops, never mind ^^, I got the bitflags version wrong

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2015

The latest upstream changes (presumably #6593) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm
Copy link
Member

jdm commented Jul 20, 2015

-S-awaiting-review +S-needs-code-changes


Reviewed 2 of 2 files at r1, 23 of 23 files at r2.
Review status: all files reviewed at latest revision, 3 unresolved discussions, all commit checks successful.


components/layout/Cargo.toml, line 66 [r2] (raw file):
0.3


python/tidy.py, line 153 [r2] (raw file):
"found asterisk instead of minimum version number"


python/tidy.py, line 162 [r2] (raw file):
This comment isn't true any more, right?


Comments from the review on Reviewable.io

@boghison
Copy link
Contributor Author

boghison commented Jul 20, 2015

@jdm I've edited the files.

@jdm
Copy link
Member

jdm commented Jul 20, 2015

-S-awaiting-review +S-needs-code-changes
Please rebuild once more and push the changes; the change to Servo.lock should disappear!


Reviewed 2 of 2 files at r3.
Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.


Comments from the review on Reviewable.io

@jdm
Copy link
Member

jdm commented Jul 20, 2015

@bors-servo: r+
-S-awaiting-review +S-awaiting-merge


Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2015

📌 Commit 0baa6b4 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2015

Testing commit 0baa6b4 with merge 58e9bc6...

bors-servo pushed a commit that referenced this pull request Jul 20, 2015
bors-servo
Make tidy check for "*" in toml files

This checks every .toml file for an asterisk and prints an error if found.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6648)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3

@bors-servo bors-servo merged commit 0baa6b4 into servo:master Jul 20, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.