auto merge of #15225 : Ryman/rust/liburl_minor, r=alexcrichton

See commits for info, a number of these are 'breaking', although liburl is marked experimental so I'm not sure that matters so much.

First two commits will be impacted if #15138 is adopted, but it's a simple rename.

Author: bors