-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update cargo, rls, miri #56924
Update cargo, rls, miri #56924
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
📌 Commit 958c9af9608465ce0cea5aa168cd9dc52e3add94 has been approved by |
⌛ Testing commit 958c9af9608465ce0cea5aa168cd9dc52e3add94 with merge 78874d64e0eec1af19b7a244079ec7cf3464b2e2... |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
💔 Test failed - status-travis |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Aye yai yai, I'll try to fix rls. |
This might be due to https://github.com/rust-lang/rls/blob/6844569133e4a5fea2a7887911d9091ef1301648/src/actions/hover.rs#L2172. There's now ongoing effort to clean RLS testing suite, rust-lang/rls#1190 cleaning what test data we write and to generate temp dirs for writing purposes during testing. @ehuss @alexcrichton Is the change very urgent? If so, we could land this PR now directly and fix Assuming temp directory is writable in CI, after the PR merge (which pulls in |
Oh good, temp directories sound better. It looks like there are three places where they need to be used: The way these tests are determining the target directory are incorrect. Will your PR switch all of them to use a temp directory? Otherwise, I was thinking of switching it to something like this: fn target_dir() -> PathBuf {
// Test output is stored in the target dir, for lack of a better
// location (a temp dir might also be reasonable, but more
// cumbersome). Unfortunately Cargo does not make it easy to detect.
if let Ok(dir) = env::var("CARGO_TARGET_DIR") {
return PathBuf::from(dir);
}
let mut path = env::current_exe().expect("Can't determine exe");
path.pop(); // chop off exe name
path.pop(); // chop off 'debug'
// When run with `--target`, also pop the target name.
if path.file_name().and_then(|s| s.to_str()) != Some("target") {
path.pop();
}
path
} I'm not in a big rush. If RLS can be fixed within a few days, I'd be fine with that. |
Yeah, these should be switched over. I missed those in the original PR, will send a follow-up upstream tomorrow. |
@ehuss could you try pulling latest merges (inl. #1199) to see if it fixes the CI? It might be worthwhile to also include changes from Xanewok@d341420 (without the submodule update, obviously) as it fixes the workaround for old, writable |
958c9af
to
614ed20
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
@Xanewok Hm, looks like it failed on CI. Looks like maybe a relative vs absolute path problem? I'm not getting the same problems locally. I'm actually seeing it randomly fail about half the time with this locally ( |
https://travis-ci.org/rust-lang/rust/jobs/469617899#L7794
I think CI fails because Re local failure, unfortunately it seems that only macOS experiences spurious failures and we can't quite dig as to what's causing this (and I don't have any access to macOS machine 😢). Might be best to disable it altogether on macOS for now. |
Yeah, Miri needs another update. I can look into it later.
These coordinated tool updates are quite painful...
|
There's a fix for Miri at rust-lang/miri#586 (pull the "rustup" branch). |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
@ehuss there's a fix at rust-lang/miri#587 (pull the |
It got merged into miri master. |
b3ffa6d
to
4b25503
Compare
@RalfJung thanks! @alexcrichton looks like the tools job is green again. |
4b25503
to
79bb51a
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Clippy fails to build now (RLS depends on it), needs #57138 to be fixed. |
79bb51a
to
5739364
Compare
Yay, it's green again! 🎉 |
Hooray! @bors r=alexcrichton |
📌 Commit 5739364 has been approved by |
@bors p=9 High potential of conflicts |
Update cargo, rls, miri Update cargo, rls, miri Added `rustc-workspace-hack` to miri so that it shares the same features for serde as other tools. cc @alexcrichton ## cargo 25 commits in 2cf1f5dda2f7ed84e94c4d32f643e0f1f15352f0..0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4 2018-12-11 03:44:04 +0000 to 2018-12-19 14:45:14 +0000 - Remove Stale bot's configuration (rust-lang/cargo#6463) - Add labels to issue templates (rust-lang/cargo#6464) - Fix new man page links. (rust-lang/cargo#6459) - Fix metabuild compile errors with --message-format=json. (rust-lang/cargo#6432) - Support alt-registry names in [patch] table. (rust-lang/cargo#6456) - Update the rustup URL (rust-lang/cargo#6455) - New man pages. (rust-lang/cargo#6405) - Reify the DepFingerprint type (rust-lang/cargo#6451) - Extract Fingerprint::new (rust-lang/cargo#6449) - Upgrade the metabuild to Rust 2018 (rust-lang/cargo#6448) - Make edition comparing code consistent (rust-lang/cargo#6450) - Document `name` and `authors` in [package] (rust-lang/cargo#6447) - Travis: only use mdbook 0.1.7. (rust-lang/cargo#6443) - Update git2-curl requirement from 0.8.1 to 0.9.0 (rust-lang/cargo#6439) - Update git2 requirement from 0.7.5 to 0.8.0 (rust-lang/cargo#6438) - Display errors when `cargo fix` fails. (rust-lang/cargo#6419) - cargo fix: fix targets with shared sources. (rust-lang/cargo#6434) - Fix panic-in-panic in tests. (rust-lang/cargo#6431) - More Rust 2018 edition cleanups (rust-lang/cargo#6422) - Cleanup some trait impls for SourceId (rust-lang/cargo#6429) - Remove a nightly check from doc tests (rust-lang/cargo#6427) - Replace CargoError with failure::Error (rust-lang/cargo#6425) - Allow testsuite warnings in dev (rust-lang/cargo#6426) - add `--dry-run` option to cargo update (rust-lang/cargo#6371) - Migrate to some Rust 2018 idioms (rust-lang/cargo#6416) ## rls 16 commits in bd5b899afb05e14d33e210ede3da241ca1ca088f..6f5e4bba7b1586fca6e0ea7724cadb5683b2f308 2018-12-10 08:53:00 +0100 to 2018-12-21 17:11:08 +0100 - Update jsonrpc-core (rust-lang/rls#1206) - Use `home_dir` from `home` crate (rust-lang/rls#1207) - Update cargo. (rust-lang/rls#1204) - Fix deprecated `trim_{left,right}` warnings (rust-lang/rls#1203) - Respect ${CARGO,RUSTUP}_HOME for tooltip relative dirs (rust-lang/rls#1201) - Separate tooltip tests that require Racer fallback (rust-lang/rls#1200) - tests: Don't generate tooltip results in tests/fixtures (rust-lang/rls#1199) - Overhaul fixture handling in tests (rust-lang/rls#1190) - Don't return symbols with empty names (rust-lang/rls#1193) - Don't check AppVeyor CI status for bors - Properly infer full_docs (rust-lang/rls#1192) - Update cargo (rust-lang/rls#1191) - Improve hover test_tooltip tests (rust-lang/rls#1175) - Fix unused warnings (rust-lang/rls#1185) - Workaround rust-lang/rls#703 to prevent obscure failures due to sccache. (rust-lang/rls#1177) - Disable travis cache (rust-lang/rls#1182) ## miri 14 commits in bccadeb..6c2fc6d 2018-12-08 11:07:22 +0100 to 2018-12-26 14:28:25 +0100 - use memory::check_bounds_ptr for offset check (rust-lang/miri#589) - Fix comparing function pointers (rust-lang/miri#587) - fix for infallible allocation (rust-lang/miri#586) - fix test for latest nightly (rust-lang/miri#585) - Treat ref-to-raw cast like a reborrow: do a special kind of retag (rust-lang/miri#572) - Test cargo-miri on Windows (rust-lang/miri#578) - Cargo miri tweaks and test that we can exclude tests (rust-lang/miri#580) - Fix cargo miri test (rust-lang/miri#550) - fix for latest nightly (rust-lang/miri#574) - Add rustc-workspace-hack. (rust-lang/miri#575) - use RUSTC_WRAPPER for the cargo hook (rust-lang/miri#573) - do not auto-detect the targets in the sysroot, instead specify target manually through env var (rust-lang/miri#570) - Cleanup: Avoid repeating signatures, get rid of to_bytes hack (rust-lang/miri#568) - Support building and running with full MIR on foreign architectures, drop support for missing MIR (rust-lang/miri#566)
☀️ Test successful - status-appveyor, status-travis |
Tested on commit rust-lang/rust@d969c61. Direct link to PR: <rust-lang/rust#56924> 🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
Update cargo, rls, miri
Added
rustc-workspace-hack
to miri so that it shares the same features for serde as other tools.cc @alexcrichton
cargo
25 commits in 2cf1f5dda2f7ed84e94c4d32f643e0f1f15352f0..0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4
2018-12-11 03:44:04 +0000 to 2018-12-19 14:45:14 +0000
name
andauthors
in [package] (Documentname
andauthors
in [package] cargo#6447)cargo fix
fails. (Display errors whencargo fix
fails. cargo#6419)--dry-run
option to cargo update (add--dry-run
option to cargo update cargo#6371)rls
16 commits in bd5b899afb05e14d33e210ede3da241ca1ca088f..6f5e4bba7b1586fca6e0ea7724cadb5683b2f308
2018-12-10 08:53:00 +0100 to 2018-12-21 17:11:08 +0100
home_dir
fromhome
crate (Usehome_dir
fromhome
crate rls#1207)trim_{left,right}
warnings (Fix deprecatedtrim_{left,right}
warnings rls#1203)miri
14 commits in bccadeb..6c2fc6d
2018-12-08 11:07:22 +0100 to 2018-12-26 14:28:25 +0100