mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1924 - RalfJung:ra, r=oli-obk

Browse Source 
hack to work around RA quirk

This is a gross hack to work around https://github.com/rust-analyzer/rust-analyzer/issues/10793: calling `cargo-miri/miri` does the same thing as calling `./miri`.

`@oli-obk` this is the best I could come up with... not sure if we want to have this in the repo. I am also okay with carrying `cargo-miri/miri` locally.
This commit is contained in:
bors 2021-11-25 22:55:43 +00:00
commit 0949cd36c3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cargo-miri/miri Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
# Hack to work around https://github.com/rust-analyzer/rust-analyzer/issues/10793.
exec "$(dirname "$0")"/../miri "$@"

5
miri
View File

@ -39,10 +39,11 @@ EOF
TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2) TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2)
SYSROOT=$(rustc --print sysroot) SYSROOT=$(rustc --print sysroot)
LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib
MIRIDIR=$(dirname "$0")
if readlink -e . &>/dev/null; then if readlink -e . &>/dev/null; then
# This platform supports `readlink -e`. # This platform supports `readlink -e`.
MIRIDIR=$(readlink -e "$MIRIDIR") MIRIDIR=$(dirname "$(readlink -e "$0")")
else
MIRIDIR=$(dirname "$0")
fi fi
if ! test -d "$LIBDIR"; then if ! test -d "$LIBDIR"; then
echo "Something went wrong determining the library dir." echo "Something went wrong determining the library dir."