Skip to content
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

Move Cargo.{toml,lock} to the repository root directory. #53586

Merged
merged 1 commit into from
Nov 22, 2018

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Aug 22, 2018

This should give us back src/ in errors, panics and debuginfo, for free.

r? @Mark-Simulacrum @alexcrichton cc @michaelwoerister

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2018
@Mark-Simulacrum
Copy link
Member

I semi-expect tests to fail for this -- I cannot find the previous attempt at this right now but believe __CARGO_TEST_ROOT will be needed for distcheck

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:48:07] ....................................................................................................
[00:48:11] ....................................................................................................
[00:48:13] ........i...........................................................................................
[00:48:16] ....................................................................................................
[00:48:19] .........................................................iiiiiiiii..................................
[00:48:24] ....................................................................................................
[00:48:28] ....................................................................................................
[00:48:30] ......................................i.............................................................
[00:48:33] ........................................................................................i.i..ii.....
---
travis_time:start:test_rustdoc-ui
Check compiletest suite=rustdoc-ui mode=ui (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:18:53] 
[01:18:53] running 6 tests
ld/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "/checkout/src/test/rustdoc-ui/failed-doctest-output.rs" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/a" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/failed-doctest-output/auxiliary"
[01:18:53] ------------------------------------------
[01:18:53] 
[01:18:53] running 2 tests
[01:18:53] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26) ... FAILED
[01:18:53] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26) ... FAILED
[01:18:53] test /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 20) ... FAILED
[01:18:53] failures:
[01:18:53] 
[01:18:53] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26) stdout ----
[01:18:53] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26) stdout ----
[01:18:53] error[E0425]: cannot find value `no` in this scope
[01:18:53]   |
[01:18:53] 3 | no
[01:18:53]   | ^^ not found in this scope
[01:18:53] 
[01:18:53] 
[01:18:53] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:333:13
[01:18:53] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:18:53] 
[01:18:53] ---- /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 20) stdout ----
[01:18:53] thread '/checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 20)' panicked at 'test executable failed:
[01:18:53] 
[01:18:53] thread 'main' panicked at 'oh no', /checkout/src/test/rustdoc-ui/failed-doctest-output.rs:3:1
[01:18:53] 
[01:18:53] ', src/librustdoc/test.rs:368:17
[01:18:53] 
[01:18:53] 
[01:18:53] 
[01:18:53] failures:
[01:18:53]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - OtherStruct (line 26)
[01:18:53]     /checkout/src/test/rustdoc-ui/failed-doctest-output.rs - SomeStruct (line 20)
[01:18:53] test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
[01:18:53] 
[01:18:53] 
[01:18:53] ------------------------------------------

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 @TimNN. (Feature Requests)

@eddyb
Copy link
Member Author

eddyb commented Aug 22, 2018

Heh, that rustdoc failure shows src/ is back in!

@alexcrichton
Copy link
Member

@bors: r+

Heh the only reason this wasn't done to start off with is because it broke things, but I believe things may have progressed since then so let's see what happens!

@bors
Copy link
Contributor

bors commented Aug 22, 2018

📌 Commit 4923fe5cc90e6517e961266dcf6fa8e6b4b22364 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2018
@bors
Copy link
Contributor

bors commented Aug 22, 2018

☔ The latest upstream changes (presumably #53607) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 22, 2018
@eddyb
Copy link
Member Author

eddyb commented Aug 24, 2018

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Aug 24, 2018

📌 Commit eee053530f64ce5dd61e62f08b7ea221d3eedc95 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 24, 2018
@bors
Copy link
Contributor

bors commented Aug 25, 2018

⌛ Testing commit eee053530f64ce5dd61e62f08b7ea221d3eedc95 with merge 1e958fa6071ac338b5a4b1bc8949ddd8d95604c7...

@bors
Copy link
Contributor

bors commented Aug 25, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 25, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:07:46]    Compiling cargo-vendor v0.1.4
[00:07:50]     Finished dev [unoptimized + debuginfo] target(s) in 2m 11s
[00:07:50]   Installing /cargo/bin/cargo-vendor
[00:07:50] warning: be sure to add `/cargo/bin` to your PATH to be able to run the installed binaries
[00:07:50] error: could not find `Cargo.lock`, must be run in a directory with Cargo.lock or use the `--sync` option
[00:07:50] To learn more, run the command again with --verbose.
[00:07:50] 
[00:07:50] 
[00:07:50] 
[00:07:50] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "vendor"
[00:07:50] 
[00:07:50] 
[00:07:50] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:07:50] Build completed unsuccessfully in 0:04:29
---
travis_time:end:1edc3316:start=1535179677668875999,finish=1535179677685976734,duration=17100735
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2f60cafc
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:174e27d7
travis_time:start:174e27d7
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:06268933
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 25, 2018
@eddyb
Copy link
Member Author

eddyb commented Aug 25, 2018

@Mark-Simulacrum Is that the failure you expected, or something simpler?
Either way, I should run distcheck locally and get it working before trying again.

@bors
Copy link
Contributor

bors commented Aug 25, 2018

☔ The latest upstream changes (presumably #53701) made this pull request unmergeable. Please resolve the merge conflicts.

@ollie27
Copy link
Member

ollie27 commented Aug 26, 2018

#47731 was the previous attempt btw.

@TimNN
Copy link
Contributor

TimNN commented Sep 4, 2018

Ping from triage @eddyb: What are you plans for this PR?

@eddyb
Copy link
Member Author

eddyb commented Nov 22, 2018

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Nov 22, 2018

📌 Commit 7c166f5 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 7c166f5 with merge c08840d...

bors added a commit that referenced this pull request Nov 22, 2018
Move Cargo.{toml,lock} to the repository root directory.

This should give us back `src/` in errors, panics and debuginfo, for free.

r? @Mark-Simulacrum @alexcrichton cc @michaelwoerister
@bors
Copy link
Contributor

bors commented Nov 22, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing c08840d to master...

@bors bors merged commit 7c166f5 into rust-lang:master Nov 22, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #53586!

Tested on commit c08840d.
Direct link to PR: #53586

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 22, 2018
Tested on commit rust-lang/rust@c08840d.
Direct link to PR: <rust-lang/rust#53586>

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
@nrc
Copy link
Member

nrc commented Nov 22, 2018

Hmm, so this seems to have broken things. I won't have time to look into it until after edition though

@eddyb
Copy link
Member Author

eddyb commented Nov 22, 2018

The fix is probably easy, I need to take a look - I suspect the same approach I used for compiletest, cargocheck and distcheck, should apply here.

@Xanewok
Copy link
Member

Xanewok commented Nov 22, 2018

https://ci.appveyor.com/project/rust-lang/rust/builds/20492571/job/b1o1sacl8oluwt2q#L9757

{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"current package believes it's in a workspace when it's not:\ncurrent:   C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t2\\cmd_format_utf16_range\\Cargo.toml\nworkspace: C:\\projects\\rust\\Cargo.toml\n\nthis may be fixable by adding `build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t2\\cmd_format_utf16_range` to the `workspace.members` array of the manifest located at: C:\\projects\\rust\\Cargo.toml","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t2/cmd_format_utf16_range/Cargo.toml"}}
{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"current package believes it's in a workspace when it's not:\ncurrent:   C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t0\\dependency_typo\\Cargo.toml\nworkspace: C:\\projects\\rust\\Cargo.toml\n\nthis may be fixable by adding `build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t0\\dependency_typo` to the `workspace.members` array of the manifest located at: C:\\projects\\rust\\Cargo.toml","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t0/dependency_typo/Cargo.toml"}}
{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"current package believes it's in a workspace when it's not:\ncurrent:   C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t4\\simple_workspace\\Cargo.toml\nworkspace: C:\\projects\\rust\\Cargo.toml\n\nthis may be fixable by adding `build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t4\\simple_workspace` to the `workspace.members` array of the manifest located at: C:\\projects\\rust\\Cargo.toml","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t4/simple_workspace/Cargo.toml"}}
{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"current package believes it's in a workspace when it's not:\ncurrent:   C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t9\\simple_workspace\\Cargo.toml\nworkspace: C:\\projects\\rust\\Cargo.toml\n\nthis may be fixable by adding `build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\rlsit\\t9\\simple_workspace` to the `workspace.members` array of the manifest located at: C:\\projects\\rust\\Cargo.toml","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/rlsit/t9/simple_workspace/Cargo.toml"}}

@pietroalbini
Copy link
Member

I won't have time to look into it until after edition though

Hmm, we need rls to be fixed the week before 1.31 is released though, otherwise we won't be able to land any PR.

@eddyb
Copy link
Member Author

eddyb commented Nov 22, 2018

It appears this is all on Rust's side, I'll send a PR to update impl Step for Rls from src/bootstrap/test.rs, although I'll have to figure out how to test it first.

EDIT: wait, I think I actually need to change rls to set the env var in its test runner.

@eddyb
Copy link
Member Author

eddyb commented Nov 23, 2018

Fix is up at rust-lang/rls#1138.
EDIT: and #56177.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.