[NFC] getopts is used by librustc and librustc_driver, but isn't declared in their Cargo.toml.

[DiamondLovesYou]

No description provided.

[rust-highfive]

r? @davidtwco

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

[davidtwco]

Thanks for the PR! You'll need to update the Cargo.lock files in order for Travis to build and pass with this.

[DiamondLovesYou]

@davidtwco Done!

[davidtwco]

@bors r+ rollup

[bors]

📌 Commit 922b9d8 has been approved by davidtwco

[kennytm]

@bors r-

Failed to build in dist-various-1 (log: #54790 (comment)).

[00:07:42]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:07:42] error[E0523]: found two different crates with name `getopts` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
[00:07:42]     |
[00:07:42] 119 | extern crate test;
[00:07:42]     | ^^^^^^^^^^^^^^^^^^
[00:07:42] 
...
[00:07:58] error: build failed
[00:07:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:07:58] expected success, got: exit code: 101
[00:07:58] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1112:9
[00:07:58] travis_fold:end:stage0-rustc

[kennytm]

@bors try

Verifying if this is caused by other PRs in the rollup or this PR itself.

[bors]

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout getopts-deps (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self getopts-deps --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[kennytm]

Oh well 🤷

[Mark-Simulacrum]

Why are these = restrictions?

[DiamondLovesYou]

To keep the existing crate version, which is what is used by some other tool (not sure which). Shall I change it?

[TimNN]

Ping from triage @DiamondLovesYou: It looks like some changes are required for this PR.

[TimNN]

Ping from triage @DiamondLovesYou: What is the status of this PR?

[TimNN]

Ping from triage! This PR hasn't seen any updates in a while, so I'm closing it for now, per our guidelines. Thank you for your contributions, @DiamondLovesYou, and please feel free to re-open in the future.