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

submodules: update clippy, rls and cargo, fix toolstate #54916

Merged
merged 4 commits into from
Oct 13, 2018

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 8, 2018

rustfmt update failed because of different rustc-ap-syntax versions.

fix clippy toolstate failure

Fixes #54697

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2018
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 8, 2018

📌 Commit 756eb263d3d5b75ae6286c9b8d18d7d09eaf67d7 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 Oct 8, 2018
@bors
Copy link
Contributor

bors commented Oct 11, 2018

☔ The latest upstream changes (presumably #54969) 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 Oct 11, 2018
@matthiaskrgr
Copy link
Member Author

rebased

@matthiaskrgr matthiaskrgr changed the title submodules: update clippy, rls and cargo submodules: update clippy, rls and cargo, fix toolstate Oct 11, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Oct 11, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 11, 2018

📌 Commit 87f5fc4 has been approved by oli-obk

@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 Oct 11, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 11, 2018
…li-obk

submodules: update clippy, rls and cargo, fix toolstate

rustfmt update failed because of different rustc-ap-syntax versions.

fix clippy toolstate failure

Fixes rust-lang#54697
@bors
Copy link
Contributor

bors commented Oct 11, 2018

⌛ Testing commit 87f5fc4 with merge 8e9aa14...

bors added a commit that referenced this pull request Oct 11, 2018
submodules: update clippy, rls and cargo, fix toolstate

rustfmt update failed because of different rustc-ap-syntax versions.

fix clippy toolstate failure

Fixes #54697
@bors
Copy link
Contributor

bors commented Oct 11, 2018

💔 Test failed - status-appveyor

@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 Oct 11, 2018
@matthiaskrgr
Copy link
Member Author

[RUSTC-TIMING] rls test:false 74.396
    Finished release [optimized] target(s) in 4m 19s
[TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-pc-windows-msvc" }, target: "x86_64-pc-windows-msvc", tool: "rls", path: "src/tools/rls", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: ["clippy"] } -- 259.688
[TIMING] Rls { stage: 2, target: "x86_64-pc-windows-msvc" } -- 12.375
Dist LlvmTools stage2 (x86_64-pc-windows-msvc)
[TIMING] LlvmTools { stage: 2, target: "x86_64-pc-windows-msvc" } -- 21.311
Dist clippy stage2 (x86_64-pc-windows-msvc)
Building stage2 tool cargo-clippy (x86_64-pc-windows-msvc)
    Finished release [optimized] target(s) in 0.74s
[TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-pc-windows-msvc" }, target: "x86_64-pc-windows-msvc", tool: "cargo-clippy", path: "src/tools/clippy", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 0.893
thread 'main' panicked at 'fs::File::open(&src) failed with The system cannot find the file specified. (os error 2)', bootstrap\lib.rs:1291:25
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failed to run: C:\projects\rust\build\bootstrap\debug\bootstrap dist
Build completed unsuccessfully in 1:13:05
Command exited with code 1
set PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\Debuggers\X64"
if exist %LOCALAPPDATA%\CrashDumps for %%f in (%LOCALAPPDATA%\CrashDumps\*) do cdb -c "k;q" -G -z "%%f"

Does that mean the binary was not found?Tthat's strange because I didn't see any clippy build failures in the log.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 11, 2018

cc @rust-lang/infra

@alexcrichton
Copy link
Member

This doesn't really look like a out-of-the-ordinary issue wrt building things, and it seems like it's probably related to the clippy submodule update. I'd recommend running the same steps locally and seeing if it fails, and perhaps using RUST_BACKTRACE to debug more (and/or adding debug prints).

@matthiaskrgr
Copy link
Member Author

I don't have a windows env available and I but run the tests of all the changed submodules locally on linux and didn't see any regressions. Hmm...

@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 Oct 12, 2018
@alexcrichton
Copy link
Member

The bug here looks to be in packaging probably, so you'll need to be executing ./x.py dist

@matthiaskrgr
Copy link
Member Author

That worked, thanks.
I bisected the dist failure to rust-lang/rust-clippy@ca437e8

Changes:

Remove now-useless `allow(unknown_lints)`
Stabilize tool lints
Use `impl Iterator` in arg position in clippy_dev
Fix fn_to_numeric_cast_with_truncation suppression
Limit commutative assign op lint to primitive types
Clarify code
Fix rust-lang#2937
Fix cast_possible_wrap and cast_sign_loss warnings
Fix cast_possible_truncation warnings
Fixes rust-lang#2925 cmp_owned false positive
if_let_redundant_pattern_matching: use Span.to() instead of Span.with_hi() to fix crash.
Improve diagnostics in case of lifetime elision (closes rust-lang#3284)
Fix items_after_statements for `const`s
Fix items_after_statements for sub-functions
Fix items_after_statements for `use` statements
Don't suggest cloned() for map Box deref
Fix excessive_precision false positive
Fix FP in `fn_to_numeric_cast_with_truncation`
new_without_default should not warn about unsafe new
fix command to manually test an example
Add license to README
Adding more detail to filter_map lint documentation.
additional people
Add license header to other files
Add license header to Rust files
Relicense clippy
Document relicensing process
Fix util/export.py to include lints from methods
Changes:

Apply Clippy lints
Respect build_dir when creating external build plans
Fix Windows tests
Implement external build plan
Detect manifest diagnostic position for toml::de::Error
Fix std::sync hover doc expectation
Apply CI specific long timeout
Propagate cargo errors as manifest diagnostics
Add test for use statement function completions
Refactor cmd test `within_timeout`
Avoid stdout-writer/rls process exit race
Improve cmd test "no shutdown response" error message
Add RUST_BACKTRACE=1 to ci env
Improve cmd test timeout reliability
Fix use statement function suggestions
Revert "Revert "Remove "edition" Cargo feature (it's stable now)""
Add build_wait() tests
Automatically tune wait_to_build
Rework cmd tests

Fixes rust-lang#54697
Changes:

Switch to use crates-io as the registry name and don't include publish when registry is not specified
fix redundant pkgid generation
validate some basic properties of a valid resolve
Detail dep name in invalid version error
Fix dashes in rename dependencies.
Bump flate2 to 1.0.3
Add default in config document
Add support for providing a default registry
Add support for registry to new and init
use impl Iterator instead of custom types in `source`
let jetbrains reorder some impls to match the definition
use impl Iterator instead of custom types in resolver and graph
remove Graph::sort as it is unused
fmt
Bump libgit2-sys to 0.7.9
Switch to use registry
Allow registry option for cargo install.
Second attempt at fixing msys terminal width.
Try to improve "version not found" error
Fix typo
@matthiaskrgr
Copy link
Member Author

I probably need to update the dist install step to point to the new license files.

@matthiaskrgr
Copy link
Member Author

Should be good to go now.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 13, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 13, 2018

📌 Commit 9c651b3 has been approved by oli-obk

@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 Oct 13, 2018
@bors
Copy link
Contributor

bors commented Oct 13, 2018

⌛ Testing commit 9c651b3 with merge 4699283...

bors added a commit that referenced this pull request Oct 13, 2018
submodules: update clippy, rls and cargo, fix toolstate

rustfmt update failed because of different rustc-ap-syntax versions.

fix clippy toolstate failure

Fixes #54697
@bors
Copy link
Contributor

bors commented Oct 13, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 4699283 to master...

@bors bors merged commit 9c651b3 into rust-lang:master Oct 13, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #54916!

Tested on commit 4699283.
Direct link to PR: #54916

🎉 clippy-driver on windows: test-fail → test-pass.
🎉 clippy-driver on linux: test-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 13, 2018
Tested on commit rust-lang/rust@4699283.
Direct link to PR: <rust-lang/rust#54916>

🎉 clippy-driver on windows: test-fail → test-pass.
🎉 clippy-driver on linux: test-fail → test-pass.
@matthiaskrgr matthiaskrgr deleted the submodules_update branch October 15, 2018 15:09
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.

Cargo warning during x.py build: "the cargo feature edition is now stable"
6 participants