Skip to content

Commit

Permalink
servo: Merge #2135 - Stop using deprecated RefCell<T>::get (from mbru…
Browse files Browse the repository at this point in the history
…beck:refcell-get); r=larsbergstrom

It's going away in the next Rust upgrade (rust-lang/rust#13301). r? larsbergstrom

We'll need to do the same in rust-layers.

Source-Repo: https://github.com/servo/servo
Source-Revision: aafadb65f2f5e318805a03f3bc9814eb1a8a50cc

UltraBlame original commit: b14ab74b1b9813efa98ef1cb51659a7979f3aa0d
  • Loading branch information
marco-c committed Sep 30, 2019
1 parent e3bd388 commit f2b9c9f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 30 deletions.
36 changes: 9 additions & 27 deletions servo/src/components/main/constellation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,11 @@ frame_tree
.
parent
.
get
borrow
(
)
.
clone
(
)
)
Expand Down Expand Up @@ -4120,7 +4124,7 @@ source_pipeline
.
url
.
get
borrow
(
)
.
Expand Down Expand Up @@ -5496,32 +5500,15 @@ given
to
the
compositor
/
/
NOTE
:
work
around
borrowchk
issues
let
tmp
next_frame_tree
=
if
to_add
.
parent
.
clone
(
)
;
let
next_frame_tree
=
if
tmp
.
get
borrow
(
)
.
Expand All @@ -5537,9 +5524,6 @@ work
around
borrowchk
issues
let
tmp
=
self
.
current_frame
Expand All @@ -5549,8 +5533,6 @@ current_frame
get_ref
(
)
;
tmp
.
clone
(
Expand Down
2 changes: 1 addition & 1 deletion servo/src/components/main/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ self
.
url
.
get
borrow
(
)
.
Expand Down
6 changes: 4 additions & 2 deletions servo/src/components/script/html/hubbub_html_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2020,11 +2020,12 @@ next_subpage_id
:
SubpageId
=
*
page
.
next_subpage_id
.
get
borrow
(
)
;
Expand Down Expand Up @@ -3082,9 +3083,10 @@ Id
let
subpage_id
=
*
next_subpage_id
.
get
borrow
(
)
;
Expand Down

0 comments on commit f2b9c9f

Please sign in to comment.