Replace @s with Rc types.(fixes #2079)
auto merge of #2085 : lpy/servo/issue2079, r=jdm

see #2079