]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #60567 - Manishearth:rollup-rjagqnw, r=Manishearth
authorbors <bors@rust-lang.org>
Sun, 5 May 2019 21:11:47 +0000 (21:11 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 May 2019 21:11:47 +0000 (21:11 +0000)
Rollup of 5 pull requests

Successful merges:

 - #60131 (Fix broken link in rustc_plugin doc)
 - #60426 (Stop `-O`/`-C opt-level` and `-g`/`-C debuginfo` conflicting)
 - #60515 (use span instead of div for since version)
 - #60530 (rustc: rename all occurences of "freevar" to "upvar".)
 - #60536 (Correct code points to match their textual description)

Failed merges:

r? @ghost


Trivial merge