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

Add --allow-staged to cargo fix #5943

Merged
merged 4 commits into from
Aug 29, 2018
Merged

Conversation

dwijnand
Copy link
Member

@dwijnand dwijnand commented Aug 28, 2018

Fixes #5737

This is @jljusten's branch, adapted to the testsuite changes in master.
Submitted as an alternative to #5910 to expedite #5737 resolution in time for Edition RC 1.

jljusten and others added 4 commits August 21, 2018 00:12
Signed-off-by: Jordan Justen <jljusten@gmail.com>
This change splits out staged changes from dirty changes, and lets the
user know if they should consider using the --allow-staged flag.

Signed-off-by: Jordan Justen <jljusten@gmail.com>
Signed-off-by: Jordan Justen <jljusten@gmail.com>
* master: (25 commits)
  Migrate from tests fom assert_that/execs to .run()
  Wrap ProcessBuilder in Execs & make .cargo return that
  Make old Execs methods take not consume self
  Extract Execs::match_process
  Add #[must_use] to Execs
  Inline Execs::_with_stderr
  Remove an unrun "cargo build" ProcessBuilder
  Add documentation for creating test dependencies.
  Only use non-absolute paths for `path` dependencies
  Fix test failure on nightly due to `codemap::Span` change.
  New metabuild strategy using custom src_path enum.
  Remove unnecessary change.
  Address review comments.
  Metabuild (RFC 2196)
  Handle Window's missing file error message
  Make "cargo uninstall" uninstall the cwd bins
  update comment based on further research
  List URL in HTTP download failures
  Fix compilation error
  Improve the `cargo install` deprecation messaging
  ...
@rust-highfive
Copy link

r? @matklad

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

@dwijnand
Copy link
Member Author

Got what looks like a spurious error on Travis CI (only):

---- path::deep_dependencies_trigger_rebuild stdout ----
running `/Users/travis/build/rust-lang/cargo/target/debug/cargo build`
running `/Users/travis/build/rust-lang/cargo/target/debug/cargo build`
running `/Users/travis/build/rust-lang/cargo/target/debug/cargo build`
running `/Users/travis/build/rust-lang/cargo/target/debug/cargo build`
thread 'path::deep_dependencies_trigger_rebuild' panicked at '
Expected: execs
    but: differences:
  0 - |[COMPILING] bar v0.5.0 (file:///Users/travis/build/rust-lang/cargo/target/cit/t888/foo/bar)|
    + |   Compiling baz v0.5.0 (file:///Users/travis/build/rust-lang/cargo/target/cit/t888/foo/baz)|
  1 - |[COMPILING] foo v0.5.0 (file:///Users/travis/build/rust-lang/cargo/target/cit/t888/foo)|
    + |   Compiling bar v0.5.0 (file:///Users/travis/build/rust-lang/cargo/target/cit/t888/foo/bar)|
  2 - |[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]|
    + |   Compiling foo v0.5.0 (file:///Users/travis/build/rust-lang/cargo/target/cit/t888/foo)|
  3 -
    + |    Finished dev [unoptimized + debuginfo] target(s) in 1.64s|

Close/reopen CI validation restart game.

@dwijnand dwijnand closed this Aug 29, 2018
@dwijnand dwijnand reopened this Aug 29, 2018
@dwijnand dwijnand closed this Aug 29, 2018
@dwijnand dwijnand reopened this Aug 29, 2018
@dwijnand
Copy link
Member Author

😕 test path::deep_dependencies_trigger_rebuild required two restarts for it to pass, and also failed at least once in #5945 while fixing stupid typos.

@alexcrichton
Copy link
Member

@bors: r+

Nice!

@bors
Copy link
Contributor

bors commented Aug 29, 2018

📌 Commit 8c2d0df has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 29, 2018

⌛ Testing commit 8c2d0df with merge 8b2082b...

bors added a commit that referenced this pull request Aug 29, 2018
Add `--allow-staged` to `cargo fix`

Fixes #5737

This is @jljusten's branch, adapted to the testsuite changes in master.
Submitted as an alternative to #5910 to expedite #5737 resolution in time for Edition RC 1.
@bors
Copy link
Contributor

bors commented Aug 29, 2018

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

@bors bors merged commit 8c2d0df into rust-lang:master Aug 29, 2018
@dwijnand dwijnand deleted the fix-allow-staged branch August 29, 2018 18:47
@ehuss ehuss added this to the 1.30.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add --allow-staged to cargo fix
7 participants