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

Convert to default installation of cargo and replace --with-cargo option with --without-cargo option #98

Merged
merged 2 commits into from
Jul 6, 2020

Conversation

chrissimpkins
Copy link
Member

@chrissimpkins chrissimpkins commented Jun 13, 2020

Closes #81

Also see the discussion in https://rust-lang.zulipchat.com/#narrow/stream/217417-t-compiler.2Fcargo-bisect-rustc/topic/unrecognized.20option.20json

This PR converts the --with-cargo optional behavior to default behavior to address Unrecognized option: 'json' errors in tests as bisection proceeds back in time past a defined date (I believe that this is ~ July 2019'ish era). The current default leads to incorrect automated detection of the regression commit due to this error. These changes also remove the --with-cargo option.

Edit: @spastorino recommended the addition of the --without-cargo flag to disable the cargo install in #98 (comment). This change was added in 2b7088c

@spastorino
Copy link
Member

Looks good but I wonder if we do want a --without-cargo kind of flag to turn this off.

@chrissimpkins
Copy link
Member Author

Looks good but I wonder if we do want a --without-cargo kind of flag to turn this off.

Anyone opposed to this? I'll add it this weekend if this is the only thing blocking the merge here.

@chrissimpkins chrissimpkins changed the title Convert to default installation of nightly cargo and remove --with-cargo option Convert to default installation of cargo and remove --with-cargo option Jun 30, 2020
@chrissimpkins
Copy link
Member Author

Rebased on master @ c5e86ee

@chrissimpkins chrissimpkins changed the title Convert to default installation of cargo and remove --with-cargo option Convert to default installation of cargo and replace --with-cargo option with --without-cargo option Jul 4, 2020
@chrissimpkins
Copy link
Member Author

--without-cargo flag added in 2b7088c

@chrissimpkins
Copy link
Member Author

@spastorino Please let me know if there is anything else that you need for this PR. Thanks Santiago!

if dl_params.install_cargo {
// download cargo by default
// deactivate with the `--without-cargo` flag
// this default behavior was changed as of v0.6.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line assumes a v0.6.0 release with the current changes if this PR is acceptable.

@spastorino spastorino merged commit 176217a into rust-lang:master Jul 6, 2020
@chrissimpkins chrissimpkins deleted the cargo-default branch July 6, 2020 14:18
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.

Mention --with-cargo in tutorial or make it a default
2 participants