about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-02 00:58:29 +0000
committerbors <bors@rust-lang.org>2018-06-02 00:58:29 +0000
commit5f7c9da0a774cdc4a4768a3873521286b632224b (patch)
tree145a2e14a4c1cf1cdf96f52f5d589ffcf1cf4779 /src/rustllvm/RustWrapper.cpp
parentbfa41f28010b336e43e2896693b26853ecc1f492 (diff)
parentc8f9b7ce712172bef0f03ab9f8fb08b3419cd4ca (diff)
downloadrust-5f7c9da0a774cdc4a4768a3873521286b632224b.tar.gz
rust-5f7c9da0a774cdc4a4768a3873521286b632224b.zip
Auto merge of #51287 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 5 pull requests

Successful merges:

 - #51135 (Tweak output on E0599 for assoc fn used as method)
 - #51152 (Replace `if` with `if and only if` in the definition dox of `Sync`)
 - #51262 (Add missing whitespace in num example)
 - #51272 (Remove feature flag from fs::read_to_string example)
 - #51286 (Pull 1.26.2 release notes into master)

Failed merges:
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions