Move away from Root::deref. #4526

Ms2ger · 2015-01-01T19:39:11Z

This is a start towards fixing #3868. Not all callers have been fixed yet, so the Deref implementation remains for now.


        Remove the 'a lifetime from Root.

It does not add any safety, as the reference is constructed from a raw pointer without limiting the lifetime in any way.


        Remove the 'b lifetime from Root.

It does not add any safety, as the reference is constructed from a raw pointer without limiting the lifetime in any way.


        Rename Root::root_ref() to Root::r().

As it will be used much more widely after the upcoming changes, this limits the effort reading and writing the method calls.


        Replace Root::deref() calls by Root::r() calls where possible.

This changes those calls that were already sound.


        Remove unsound Root::deref() call in Attr::set_value.

This changes those calls whose unsoundness was not picked up by the type system because of a lifetime constraint that cannot be expressed at this time.


        Remove unsound Root::deref() calls in XMLHttpRequest.


        Remove unsound Root::deref() call in BrowserContext::create_window_pr…

…oxy.


        Remove unsound Root::deref() calls in CSSStyleDeclaration.


        Remove unsound Root::deref() call in Document::get_html_element.


        Convince borrowck that Document::createNodeList is sound.


        Remove unsound Root::deref() call in Document::set_quirks_mode.


        Remove unsound Root::deref() calls in DOMParser::ParseFromString.

Note that Root::clone() calls through to JSRef::clone() due to autoderef.


        Remove unsound Root::deref() calls in HTML elements.


        Rename GlobalRoot::root_ref() to GlobalRoot::r() for consistency.

highfive · 2015-01-01T19:39:15Z

Warning

These commits modify unsafe code. Please review it carefully!

hoppipolla-critic-bot · 2015-01-01T19:39:17Z

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

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.


        Construct a new JSRef in Root::r().

Manishearth · 2015-01-02T12:39:31Z

r+

bors-servo · 2015-01-02T16:22:50Z

saw approval from Manishearth
at 203d166

bors-servo · 2015-01-02T16:22:50Z

merging servo/servo/deref-1 = 203d166 into auto

bors-servo · 2015-01-02T16:22:51Z

servo/servo/deref-1 = 203d166 merged ok, testing candidate = 141b5d0

bors-servo · 2015-01-02T16:42:47Z

all tests pass:
success: http://build.servo.org/builders/linux1/builds/447
success: http://build.servo.org/builders/linux2/builds/446
success: http://build.servo.org/builders/android/builds/482
success: http://build.servo.org/builders/mac1/builds/663
success: http://build.servo.org/builders/mac2/builds/664

bors-servo · 2015-01-02T16:45:47Z

fast-forwarding master to auto = 141b5d0

Manishearth · 2015-01-02T12:39:31Z

r+

bors-servo · 2015-01-02T16:22:50Z

saw approval from Manishearth
at 203d166

bors-servo · 2015-01-02T16:22:50Z

merging servo/servo/deref-1 = 203d166 into auto

bors-servo · 2015-01-02T16:22:51Z

servo/servo/deref-1 = 203d166 merged ok, testing candidate = 141b5d0

bors-servo · 2015-01-02T16:42:47Z

all tests pass:
success: http://build.servo.org/builders/linux1/builds/447
success: http://build.servo.org/builders/linux2/builds/446
success: http://build.servo.org/builders/android/builds/482
success: http://build.servo.org/builders/mac1/builds/663
success: http://build.servo.org/builders/mac2/builds/664

bors-servo · 2015-01-02T16:45:47Z

fast-forwarding master to auto = 141b5d0


        auto merge of #4526 : servo/servo/deref-1, r=Manishearth

This is a start towards fixing #3868. Not all callers have been fixed yet, so the `Deref` implementation remains for now.

Ms2ger added 14 commits Jan 1, 2015

Remove the 'a lifetime from Root.

95ec20b

It does not add any safety, as the reference is constructed from a raw pointer without limiting the lifetime in any way.

Remove the 'b lifetime from Root.

1290c18

It does not add any safety, as the reference is constructed from a raw pointer without limiting the lifetime in any way.

Rename Root::root_ref() to Root::r().

c9f26df

As it will be used much more widely after the upcoming changes, this limits the effort reading and writing the method calls.

Replace Root::deref() calls by Root::r() calls where possible.

1dad710

This changes those calls that were already sound.

Remove unsound Root::deref() call in Attr::set_value.

a094c0a

This changes those calls whose unsoundness was not picked up by the type system because of a lifetime constraint that cannot be expressed at this time.

Remove unsound Root::deref() calls in XMLHttpRequest.

925058e

Remove unsound Root::deref() call in BrowserContext::create_window_pr…

740ee84

…oxy.

Remove unsound Root::deref() calls in CSSStyleDeclaration.

ff96d8c

Remove unsound Root::deref() call in Document::get_html_element.

e5ae267

Convince borrowck that Document::createNodeList is sound.

eb715a7

Remove unsound Root::deref() call in Document::set_quirks_mode.

ca9b535

Remove unsound Root::deref() calls in DOMParser::ParseFromString.

6032a2f

Note that Root::clone() calls through to JSRef::clone() due to autoderef.

Remove unsound Root::deref() calls in HTML elements.

d09d245

Rename GlobalRoot::root_ref() to GlobalRoot::r() for consistency.

6077ed0

jdm added S-awaiting-review S-needs-code-changes and removed S-awaiting-review labels Jan 2, 2015

Construct a new JSRef in Root::r().

Loading status checks…

203d166

bors-servo pushed a commit that referenced this pull request Jan 2, 2015

auto merge of #4526 : servo/servo/deref-1, r=Manishearth

Loading status checks…

141b5d0

This is a start towards fixing #3868. Not all callers have been fixed yet, so the `Deref` implementation remains for now.

bors-servo closed this Jan 2, 2015

bors-servo merged commit 203d166 into master Jan 2, 2015
1 check passed

1 check passed

default all tests passed

tetsuharuohzeki deleted the deref-1 branch Jan 2, 2015

servo / servo

Move away from Root::deref. #4526

Move away from Root::deref. #4526

Ms2ger commented Jan 1, 2015

highfive commented Jan 1, 2015

hoppipolla-critic-bot commented Jan 1, 2015

This comment has been minimized.

Manishearth commented on `203d166` Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

Manishearth commented on `203d166` Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

servo / servo

Join GitHub today

Move away from Root::deref. #4526

Move away from Root::deref. #4526

Conversation

Ms2ger commented Jan 1, 2015

highfive commented Jan 1, 2015

hoppipolla-critic-bot commented Jan 1, 2015

This comment has been minimized.

Manishearth commented on 203d166 Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

Manishearth commented on 203d166 Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

This comment has been minimized.

bors-servo replied Jan 2, 2015

Manishearth commented on `203d166` Jan 2, 2015

Manishearth commented on `203d166` Jan 2, 2015