Update Cargo #48986

matklad · 2018-03-13T17:22:03Z

r? @alexcrichton

Let's put new clap argument parsing in production to see if anything dies in flames :)

alexcrichton · 2018-03-13T17:29:20Z

@bors: r+

bors · 2018-03-13T17:29:21Z

📌 Commit 759fa2c has been approved by alexcrichton

kennytm · 2018-03-14T13:27:51Z

@bors r-

Several tests for cargo are failing due difference between clap and docopt.

[01:27:28] ---- build::wrong_message_format_option stdout ----
[01:27:28] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build --message-format XML`
[01:27:28] thread 'build::wrong_message_format_option' panicked at '
[01:27:28] Expected: execs
[01:27:28]     but: expected to find:
[01:27:28] error: 'XML' isn't a valid value for '--message-format <FMT>'
[01:27:28] <tab>[possible values: human, json]
[01:27:28] 
[01:27:28] 
[01:27:28] did not find in output:
[01:27:28] error: 'XML' isn't a valid value for '--message-format <FMT>'
[01:27:28] <tab>[values: human, json]
[01:27:28] 
[01:27:28] 
[01:27:28] USAGE:
[01:27:28]     cargo build --message-format <FMT>
[01:27:28] 
[01:27:28] For more information try --help
[01:27:28] ', tools/cargo/tests/testsuite/hamcrest.rs:13:9
[01:27:28] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:27:28] 
[01:27:28] ---- metadata::cargo_metadata_bad_version stdout ----
[01:27:28] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo metadata --no-deps --format-version 2`
[01:27:28] thread 'metadata::cargo_metadata_bad_version' panicked at '
[01:27:28] Expected: execs
[01:27:28]     but: expected to find:
[01:27:28] error: '2' isn't a valid value for '--format-version <VERSION>'
[01:27:28] <tab>[possible values: 1]
[01:27:28] 
[01:27:28] 
[01:27:28] did not find in output:
[01:27:28] error: '2' isn't a valid value for '--format-version <VERSION>'
[01:27:28] <tab>[values: 1]
[01:27:28] 
[01:27:28] 
[01:27:28] USAGE:
[01:27:28]     cargo metadata --format-version <VERSION> --no-deps
[01:27:28] 
[01:27:28] For more information try --help
[01:27:28] ', tools/cargo/tests/testsuite/hamcrest.rs:13:9
[01:27:28] 
[01:27:28] ---- run::dashes_are_forwarded stdout ----
[01:27:28] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo run -- a -- b`
[01:27:28] thread 'run::dashes_are_forwarded' panicked at '
[01:27:28] Expected: execs
[01:27:28]     but: exited with exit code: 101
[01:27:28] --- stdout
[01:27:28] 
[01:27:28] --- stderr
[01:27:28] warning: path `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t897/foo/src/main.rs` was erroneously implicitly accepted for binary `bar`,
[01:27:28] please set bin.path in Cargo.toml
[01:27:28]    Compiling foo v0.0.1 (file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t897/foo)
[01:27:28]     Finished dev [unoptimized + debuginfo] target(s) in 0.77 secs
[01:27:28]      Running `target/debug/bar a b`
[01:27:28] thread 'main' panicked at 'assertion failed: `(left == right)`
[01:27:28]   left: `"b"`,
[01:27:28]  right: `"--"`', src/main.rs:5:17
[01:27:28] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:27:28] ', tools/cargo/tests/testsuite/hamcrest.rs:13:9
[01:27:28] 
[01:27:28] 
[01:27:28] failures:
[01:27:28]     build::wrong_message_format_option
[01:27:28]     metadata::cargo_metadata_bad_version
[01:27:28]     run::dashes_are_forwarded
[01:27:28] 
[01:27:28] test result: FAILED. 1177 passed; 3 failed; 1 ignored; 0 measured; 0 filtered out

matklad · 2018-03-14T13:34:18Z

Several tests for cargo are failing due difference between clap and docopt.

Not exactly, it's because the tests are using error messages from clap version X, and on rust-lang/rust, clap is on version Y. Guess I'll need to loosen tests up a bit!

matklad · 2018-03-14T13:44:11Z

On the other hand, the easier route is just to update clap here :)

I am not 100% sure that relaxing the tests would be a better solution: it's important to check that the error messages actually look reasonable to protect from, say, potential clap regressions.

Perhaps updating the error messages once in a while won't be such a big chore in practice? Note that we'll hit the need of update in Cargo first, because its CI does not use lockfile, and always uses the latest clap.

alexcrichton · 2018-03-14T14:15:32Z

@bors: r+

bors · 2018-03-14T14:15:33Z

📌 Commit 5be1d82 has been approved by alexcrichton

bors · 2018-03-14T21:06:41Z

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

matklad · 2018-03-16T10:43:35Z

Resolved conflicts and updated Cargo even more, to include rust-lang/cargo#5188 as well

matklad · 2018-03-16T13:27:04Z

Found a regression with clap, so don't r+ this just yet :)

matklad · 2018-03-16T16:41:14Z

Updated with the fix for the regression.

alexcrichton · 2018-03-16T16:42:41Z

@bors: r+

bors · 2018-03-16T16:42:42Z

📌 Commit a4ed1ad has been approved by alexcrichton

bors · 2018-03-16T22:49:13Z

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

This notably includes * rust-lang/cargo#5152 * rust-lang/cargo#5188 The first one switches cargo from docopt to clap ( we also update to the latest calp in this repository), the second one should help us to unify feature flags for Cargo itself and RLS, and build Cargo libray only once.

matklad · 2018-03-16T23:21:53Z

rebased

alexcrichton · 2018-03-17T17:55:59Z

@bors: r+

bors · 2018-03-17T17:55:59Z

📌 Commit b15b023 has been approved by alexcrichton

bors · 2018-03-18T10:03:24Z

⌛ Testing commit b15b023 with merge 8aa27ee...

@alexcrichton

Update Cargo r? @alexcrichton Let's put new clap argument parsing in production to see if anything dies in flames :)

bors · 2018-03-18T12:48:33Z

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

kennytm-githubbot · 2018-03-18T12:50:06Z

📣 Toolstate changed by #48986!

Tested on commit 8aa27ee.
Direct link to PR: #48986

💔 rls on windows: test-pass → build-fail (cc @nrc).
💔 rls on linux: test-pass → build-fail (cc @nrc).

@nrc

Tested on commit rust-lang/rust@8aa27ee. Direct link to PR: <rust-lang/rust#48986> 💔 rls on windows: test-pass → build-fail (cc @nrc). 💔 rls on linux: test-pass → build-fail (cc @nrc).

kennytm · 2018-03-18T12:56:30Z

[01:09:14] error[E0308]: mismatched types
[01:09:14]    --> tools/rls/src/build/cargo.rs:188:44
[01:09:14]     |
[01:09:14] 188 |     let spec = Packages::from_flags(false, &[], &packages)?;
[01:09:14]     |                                            ^^^
[01:09:14]     |                                            |
[01:09:14]     |                                            expected struct `std::vec::Vec`, found &[_; 0]
[01:09:14]     |                                            help: try using a conversion method: `&[].to_vec()`
[01:09:14]     |
[01:09:14]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:14]                found type `&[_; 0]`
[01:09:14]
[01:09:14] error[E0308]: mismatched types
[01:09:14]    --> tools/rls/src/build/cargo.rs:188:49
[01:09:14]     |
[01:09:14] 188 |     let spec = Packages::from_flags(false, &[], &packages)?;
[01:09:14]     |                                                 ^^^^^^^^^
[01:09:14]     |                                                 |
[01:09:14]     |                                                 expected struct `std::vec::Vec`, found reference
[01:09:14]     |                                                 help: consider removing the borrow: `packages`
[01:09:14]     |
[01:09:14]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:14]                found type `&std::vec::Vec<std::string::String>`
[01:09:14]
[01:09:14] error[E0308]: mismatched types
[01:09:14]    --> tools/rls/src/build/cargo.rs:191:17
[01:09:14]     |
[01:09:14] 191 |         target: opts.target.as_ref().map(|t| &t[..]),
[01:09:14]     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::string::String`, found &str
[01:09:14]     |
[01:09:14]     = note: expected type `std::option::Option<std::string::String>`
[01:09:14]                found type `std::option::Option<&str>`
[01:09:14]
[01:09:14] error[E0308]: mismatched types
[01:09:14]    --> tools/rls/src/build/cargo.rs:195:13
[01:09:14]     |
[01:09:14] 195 |             &opts.bin,
[01:09:14]     |             ^^^^^^^^^
[01:09:14]     |             |
[01:09:14]     |             expected struct `std::vec::Vec`, found reference
[01:09:14]     |             help: consider removing the borrow: `opts.bin`
[01:09:14]     |
[01:09:14]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:14]                found type `&std::vec::Vec<std::string::String>`
[01:09:14]
[01:09:15] error[E0308]: mismatched types
[01:09:15]    --> tools/rls/src/build/cargo.rs:198:13
[01:09:15]     |
[01:09:15] 198 |             &[],
[01:09:15]     |             ^^^
[01:09:15]     |             |
[01:09:15]     |             expected struct `std::vec::Vec`, found &[_; 0]
[01:09:15]     |             help: try using a conversion method: `&[].to_vec()`
[01:09:15]     |
[01:09:15]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:15]                found type `&[_; 0]`
[01:09:15]
[01:09:15] error[E0308]: mismatched types
[01:09:15]    --> tools/rls/src/build/cargo.rs:200:13
[01:09:15]     |
[01:09:15] 200 |             &[],
[01:09:15]     |             ^^^
[01:09:15]     |             |
[01:09:15]     |             expected struct `std::vec::Vec`, found &[_; 0]
[01:09:15]     |             help: try using a conversion method: `&[].to_vec()`
[01:09:15]     |
[01:09:15]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:15]                found type `&[_; 0]`
[01:09:15]
[01:09:16] error[E0308]: mismatched types
[01:09:16]    --> tools/rls/src/build/cargo.rs:202:13
[01:09:16]     |
[01:09:16] 202 |             &[],
[01:09:16]     |             ^^^
[01:09:16]     |             |
[01:09:16]     |             expected struct `std::vec::Vec`, found &[_; 0]
[01:09:16]     |             help: try using a conversion method: `&[].to_vec()`
[01:09:16]     |
[01:09:16]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:16]                found type `&[_; 0]`
[01:09:16]
[01:09:16] error[E0308]: mismatched types
[01:09:16]    --> tools/rls/src/build/cargo.rs:206:19
[01:09:16]     |
[01:09:16] 206 |         features: &opts.features,
[01:09:16]     |                   ^^^^^^^^^^^^^^
[01:09:16]     |                   |
[01:09:16]     |                   expected struct `std::vec::Vec`, found reference
[01:09:16]     |                   help: consider removing the borrow: `opts.features`
[01:09:16]     |
[01:09:16]     = note: expected type `std::vec::Vec<std::string::String>`
[01:09:16]                found type `&std::vec::Vec<std::string::String>`
[01:09:16]
[01:09:17] error: aborting due to 8 previous errors
[01:09:17]
[01:09:17] For more information about this error, try `rustc --explain E0308`.
[01:09:17] error: Could not compile `rls`.

matklad · 2018-03-18T14:03:51Z

The RLS itself is already updated (rust-lang/rls@c0f07b3), so only submodule update in rust-lang/rust is required.

kennytm · 2018-03-18T14:23:48Z

Thanks @matklad! I'll include this into #49134 then.

messense · 2018-03-19T03:56:31Z

I am not sure if it's related to this, but it seems that third party Cargo commands no longer work by executing cargo whatever-third-party-command? For example I am using cargo-update:

$ cargo install-update -a
error: The subcommand 'install-update' wasn't recognized
	Did you mean 'install'?

If you believe you received this message in error, try re-running with 'cargo -- install-update'

USAGE:
    cargo [OPTIONS] [SUBCOMMAND]

For more information try --help

$ cargo -- install-update -a
error: The subcommand 'install-update' wasn't recognized
	Did you mean 'install'?

If you believe you received this message in error, try re-running with 'cargo -- install-update'

USAGE:
    cargo [OPTIONS] [SUBCOMMAND]

For more information try --help

Stable works fine:

$ cargo +stable install-update -a
    Updating registry `https://github.com/rust-lang/crates.io-index`

Package                          Installed      Latest         Needs update
bindgen                          v0.33.2        v0.33.2        No

No packages need updating.

matklad · 2018-03-19T06:12:39Z

Thank you so much for the report @messense ! Opened an issue at the Cargo tracker: rust-lang/cargo#5201, and investigating.

Looks like not every external subcommand is broken, only those that are named closely to the built-in ones.

Update clap This should fix a regression in Cargo after swithing to clap, when an external subcommand was not discovered, if its name was close to a built in command. bug report: #48986 (comment) fix: clap-rs/clap#1215

Update clap This should fix a regression in Cargo after swithing to clap, when an external subcommand was not discovered, if its name was close to a built in command. bug report: rust-lang#48986 (comment) fix: clap-rs/clap#1215

rust-highfive assigned alexcrichton Mar 13, 2018

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 13, 2018

kennytm mentioned this pull request Mar 14, 2018

Rollup of 12 pull requests #49008

Merged

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 Mar 14, 2018

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 Mar 14, 2018

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 Mar 14, 2018

matklad force-pushed the update-cargo branch from 5be1d82 to 5c78096 Compare March 16, 2018 10:40

matklad mentioned this pull request Mar 16, 2018

rustbuild: Fail the build if we build Cargo twice #49053

Merged

matklad force-pushed the update-cargo branch from 5c78096 to a4ed1ad Compare March 16, 2018 16:39

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 Mar 16, 2018

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 Mar 16, 2018

matklad force-pushed the update-cargo branch from a4ed1ad to b15b023 Compare March 16, 2018 23:21

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 Mar 17, 2018

bors added a commit that referenced this pull request Mar 18, 2018

Auto merge of #48986 - matklad:update-cargo, r=alexcrichton

8aa27ee

Update Cargo r? @alexcrichton Let's put new clap argument parsing in production to see if anything dies in flames :)

bors merged commit b15b023 into rust-lang:master Mar 18, 2018

kennytm mentioned this pull request Mar 18, 2018

Update clippy and RLS #49134

Merged

matklad mentioned this pull request Mar 19, 2018

Clap update broke some external subcommands rust-lang/cargo#5201

Closed

matklad deleted the update-cargo branch March 19, 2018 06:12

matklad mentioned this pull request Mar 19, 2018

Update clap #49182

Merged

pietroalbini mentioned this pull request Mar 20, 2018

The great Travis speedup rust-lang/crater#200

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Cargo #48986

Update Cargo #48986

matklad commented Mar 13, 2018

alexcrichton commented Mar 13, 2018

bors commented Mar 13, 2018

kennytm commented Mar 14, 2018

matklad commented Mar 14, 2018

matklad commented Mar 14, 2018 •

edited

Loading

alexcrichton commented Mar 14, 2018

bors commented Mar 14, 2018

bors commented Mar 14, 2018

matklad commented Mar 16, 2018

matklad commented Mar 16, 2018

matklad commented Mar 16, 2018

alexcrichton commented Mar 16, 2018

bors commented Mar 16, 2018

bors commented Mar 16, 2018

matklad commented Mar 16, 2018

alexcrichton commented Mar 17, 2018

bors commented Mar 17, 2018

bors commented Mar 18, 2018

bors commented Mar 18, 2018

kennytm-githubbot commented Mar 18, 2018

kennytm commented Mar 18, 2018

matklad commented Mar 18, 2018

kennytm commented Mar 18, 2018

messense commented Mar 19, 2018

matklad commented Mar 19, 2018

Update Cargo #48986

Update Cargo #48986

Conversation

matklad commented Mar 13, 2018

alexcrichton commented Mar 13, 2018

bors commented Mar 13, 2018

kennytm commented Mar 14, 2018

matklad commented Mar 14, 2018

matklad commented Mar 14, 2018 • edited Loading

alexcrichton commented Mar 14, 2018

bors commented Mar 14, 2018

bors commented Mar 14, 2018

matklad commented Mar 16, 2018

matklad commented Mar 16, 2018

matklad commented Mar 16, 2018

alexcrichton commented Mar 16, 2018

bors commented Mar 16, 2018

bors commented Mar 16, 2018

matklad commented Mar 16, 2018

alexcrichton commented Mar 17, 2018

bors commented Mar 17, 2018

bors commented Mar 18, 2018

bors commented Mar 18, 2018

kennytm-githubbot commented Mar 18, 2018

kennytm commented Mar 18, 2018

matklad commented Mar 18, 2018

kennytm commented Mar 18, 2018

messense commented Mar 19, 2018

matklad commented Mar 19, 2018

matklad commented Mar 14, 2018 •

edited

Loading