about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-27 02:38:50 +0000
committerbors <bors@rust-lang.org>2020-04-27 02:38:50 +0000
commitef71df106b957eb84c1f028240ba8e85b614d043 (patch)
tree01ecd1395ad020e1f69435278418196d4ada5ebf /src/rustllvm/RustWrapper.cpp
parent5794e779a62aa1208311ac8b4f9603cad8f31912 (diff)
parentcddbed00032080b947542307249fa141331887be (diff)
downloadrust-ef71df106b957eb84c1f028240ba8e85b614d043.tar.gz
rust-ef71df106b957eb84c1f028240ba8e85b614d043.zip
Auto merge of #71600 - Dylan-DPC:rollup-7tvzi9n, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #68716 (Stabilize `Span::mixed_site`)
 - #71263 (Remove unused abs_path method from rustc_span::source_map::FileLoader)
 - #71409 (Point at the return type on `.into()` failure caused by `?`)
 - #71419 (add message for resolution failure because wrong namespace)
 - #71438 (Tweak some suggestions in `rustc_resolve`)
 - #71589 (remove Unique::from for shared pointer types)

Failed merges:

r? @ghost
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions