Skip to content

Run on Rust stable - #95

Merged
bors-servo merged 13 commits into
masterfrom
stable
Jul 27, 2015
Merged

Run on Rust stable#95
bors-servo merged 13 commits into
masterfrom
stable

Conversation

@SimonSapin

Copy link
Copy Markdown
Member

Without --features unstable:

  • Atom is 16 bytes instead of 8. (It has a drop flag.)
  • ns! and atom! are giant generated macros instead of plugins, and so may increase compile times.

r? @glennw, particularly c4fa256.

Needed for servo/html5ever#53

Review on Reviewable

@SimonSapin
SimonSapin force-pushed the stable branch 3 times, most recently from 8cbd44a to 17ced83 Compare July 18, 2015 22:49
@glennw

glennw commented Jul 20, 2015

Copy link
Copy Markdown
Member

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


.travis.yml, line 8 [r1] (raw file):
Is this saying we don't run the tests on anything but nightly? Is there a reason for that?


src/atom/mod.rs, line 91 [r1] (raw file):
I think this still handles the ABA case mentioned in the comments. Might be worth a double check though.


src/atom/mod.rs, line 234 [r1] (raw file):
Do we still need this check for the optimized case?


Comments from the review on Reviewable.io

@SimonSapin

Copy link
Copy Markdown
Member Author

Review status: 10 of 14 files reviewed at latest revision, 3 unresolved discussions, some commit checks pending.


.travis.yml, line 8 [r1] (raw file):
Yes, because benchmarks and some tests require unstable features. I’ve added a commit to disable just those when --feature unstable is not given.


src/atom/mod.rs, line 234 [r1] (raw file):
I don’t understand. Need what in what case? There is no refcount to decrement if an atom is not dynamic.


Comments from the review on Reviewable.io

@SimonSapin

Copy link
Copy Markdown
Member Author

Review status: 10 of 14 files reviewed at latest revision, 3 unresolved discussions, all commit checks successful.


src/atom/mod.rs, line 91 [r1] (raw file):
I believe the logic is the same as before in all three cases:

  • ptr is null: allocate a new entry and return a pointer to that entry.
  • ptr is not null, and the refcount was zero before we incremented it: decrement it again, allocate a new entry and return a pointer to that entry.
  • ptr is not null, and the refcount was positive: return ptr unchanged.

Comments from the review on Reviewable.io

@bors-servo

Copy link
Copy Markdown
Contributor

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

We only need 2 bits to store the tag (which is 0b_00, 0b_01, or 0b_10).
This will enable using `Box::new` instead of `heap::allocate`.

@gw, was there another reason to have it at 16?
…eature flag.

Without `--features unstable`:

* `Atom` is 16 bytes instead of 8. (It has a drop flag.)
* `ns!` and `atom!` are giant generated macros instead of plugins, and
so may increase compile time.
That way, a deprecation warning won’t break dependants.
It’s not necessary, but makes it clearer to readers what’s going on.
@glennw

glennw commented Jul 26, 2015

Copy link
Copy Markdown
Member

Reviewed 1 of 14 files at r1.
Review status: 9 of 13 files reviewed at latest revision, 3 unresolved discussions, all commit checks successful.


Comments from the review on Reviewable.io

@glennw

glennw commented Jul 26, 2015

Copy link
Copy Markdown
Member

@SimonSapin looks good to me.

@SimonSapin

Copy link
Copy Markdown
Member Author

@bors-servo r=glennw

@bors-servo

Copy link
Copy Markdown
Contributor

📌 Commit f7fd964 has been approved by glennw

@bors-servo

Copy link
Copy Markdown
Contributor

⌛ Testing commit f7fd964 with merge dd1b626...

bors-servo pushed a commit that referenced this pull request Jul 27, 2015
Run on Rust stable

Without `--features unstable`:

* `Atom` is 16 bytes instead of 8. (It has a drop flag.)
* `ns!` and `atom!` are giant generated macros instead of plugins, and so may increase compile times.

r? @glennw, particularly c4fa256.

Needed for servo/html5ever#53

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

Copy link
Copy Markdown
Contributor

☀️ Test successful - travis

@bors-servo
bors-servo merged commit f7fd964 into master Jul 27, 2015
@SimonSapin
SimonSapin deleted the stable branch July 27, 2015 06:07
SimonSapin added a commit to servo/servo that referenced this pull request Jul 30, 2015
@SimonSapin SimonSapin mentioned this pull request Nov 19, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants