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

Cargo book nitpick in Manifest section #8543

Merged
merged 3 commits into from
Jul 24, 2020

Conversation

CPerezz
Copy link
Contributor

@CPerezz CPerezz commented Jul 24, 2020

The Manifest section states on the example that the
default edition is 2018, but the lines of text above
state that the default is 2015 which is not correct.

Closes #8541

CPerezz and others added 3 commits April 27, 2020 12:26
The Manifest section states on the example that the
default edition is 2018, but the lines of text avobe
state that the default is `2015` which is not correct.

Closes rust-lang#8541
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Eh2406 (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 24, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented Jul 24, 2020

@bors r+ Thank you!

@bors
Copy link
Contributor

bors commented Jul 24, 2020

📌 Commit 6f8546f has been approved by Eh2406

@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 Jul 24, 2020
@bors
Copy link
Contributor

bors commented Jul 24, 2020

⌛ Testing commit 6f8546f with merge d3360ad...

@bors
Copy link
Contributor

bors commented Jul 24, 2020

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing d3360ad to master...

@bors bors merged commit d3360ad into rust-lang:master Jul 24, 2020
@ehuss
Copy link
Contributor

ehuss commented Jul 24, 2020

This is incorrect, would you mind reverting it? The default is 2015. The examples aren't there to show the defaults (for example, the description doesn't default to "A short description of my package"), they are just there to show an example.

@CPerezz
Copy link
Contributor Author

CPerezz commented Jul 25, 2020

If you create a new lib with the latest stable with cargo new --lib foo it comes with the edition 2018.

That's why I did the change @ehuss

@ehuss
Copy link
Contributor

ehuss commented Jul 25, 2020

Yes, the default for cargo new is 2018 (and specified in the docs). The default in the manifest if the edition is not specified is 2015.

@CPerezz
Copy link
Contributor Author

CPerezz commented Jul 25, 2020

My apologies then.
Sorry for the inconvenience.

@Eh2406
Copy link
Contributor

Eh2406 commented Jul 25, 2020

I to apologize, I should have read more carefully before reviewing.

@Eh2406
Copy link
Contributor

Eh2406 commented Jul 27, 2020

@CPerezz do you want to make a PR fixing it back or would you like me to?

@CPerezz
Copy link
Contributor Author

CPerezz commented Jul 27, 2020 via email

CPerezz added a commit to CPerezz/cargo that referenced this pull request Jul 28, 2020
On rust-lang#8543 it was introduced a change on the Cargo Book docs
where it was incorrectly stated that the default edition for
the Cargo Manifest was `2018` when indeed, as @ehuss correctly stated
in rust-lang#8543 (comment)
it is not.

Therefore, as @Eh2406 asked for, I made the PR reverting this changes
and leaving the Cargo Book docs as they were before.
bors added a commit that referenced this pull request Jul 28, 2020
Revert Cargo Book changes for default edition

On #8543 it was introduced a change on the Cargo Book docs
where it was incorrectly stated that the default edition for
the Cargo Manifest was `2018` when indeed, as @ehuss correctly stated
in #8543 (comment)
it is not.

Therefore, as @Eh2406 asked for, I made the PR reverting this changes
and leaving the Cargo Book docs as they were before.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2020
Update cargo

14 commits in aa6872140ab0fa10f641ab0b981d5330d419e927..974eb438da8ced6e3becda2bbf63d9b643eacdeb
2020-07-23 13:46:27 +0000 to 2020-07-29 16:15:05 +0000
- Fix O0 build scripts by default without `[profile.release]` (rust-lang/cargo#8560)
- Emphasize git dependency version locking behavior. (rust-lang/cargo#8561)
- Update lock file encodings on changes (rust-lang/cargo#8554)
- Fix sporadic lto test failures. (rust-lang/cargo#8559)
- build-std: Fix libraries paths following upstream (rust-lang/cargo#8558)
- Flag git http errors as maybe spurious (rust-lang/cargo#8553)
- Display builtin aliases with `cargo --list` (rust-lang/cargo#8542)
- Check manifest for requiring nonexistent features (rust-lang/cargo#7950)
- Clarify test name filter usage (rust-lang/cargo#8552)
- Revert Cargo Book changes for default edition (rust-lang/cargo#8551)
- Prepare for not defaulting to master branch for git deps (rust-lang/cargo#8522)
- Include `+` for crates.io feature requirements in the Cargo Book section on features (rust-lang/cargo#8547)
- Update termcolor and fwdansi versions (rust-lang/cargo#8540)
- Cargo book nitpick in Manifest section (rust-lang/cargo#8543)
@ehuss ehuss added this to the 1.47.0 milestone Feb 6, 2022
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 book documentation nitpick in Manifest-Edition section
5 participants