about summary refs log tree commit diff
path: root/src/rustllvm/ExecutionEngineWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-04 21:06:34 -0700
committerbors <bors@rust-lang.org>2014-04-04 21:06:34 -0700
commit339d4002617d5b36d6125d8a1781a6ada2e0a3f8 (patch)
treeb7d7ca0b968561e2a70fa6bf39fd9ab62ad968b9 /src/rustllvm/ExecutionEngineWrapper.cpp
parent4cf8d8ce69c1d1d10e90b04230d4c4e8dbb67bcc (diff)
parentf4cde4eddc04733da478ae1030ebc1ddeec04d80 (diff)
downloadrust-339d4002617d5b36d6125d8a1781a6ada2e0a3f8.tar.gz
rust-339d4002617d5b36d6125d8a1781a6ada2e0a3f8.zip
auto merge of #13284 : pnkfelix/rust/more-fs-info-on-crate-mismatch, r=alexcrichton
Fix #13266.

There is a little bit of acrobatics in the definition of `crate_paths`
to avoid calling `clone()` on the dylib/rlib unless we actually are
going to need them.

The other oddity is that I have replaced the `root_ident: Option<&str>`
parameter with a `root: &Option<CratePaths>`, which may surprise one
who was expecting to see something like: `root: Option<&CratePaths>`.
I went with the approach here because I could not come up with code for
the alternative that was acceptable to the borrow checker.
Diffstat (limited to 'src/rustllvm/ExecutionEngineWrapper.cpp')
0 files changed, 0 insertions, 0 deletions