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 details of each setting in the toolchain file #3067

Merged

Conversation

nicholasbishop
Copy link
Contributor

@nicholasbishop nicholasbishop commented Sep 6, 2022

The format of the new section is modeled after the cargo docs, for example:
https://doc.rust-lang.org/cargo/reference/profiles.html#profile-settings

This is mostly a reorganization of the existing content to make it
easier to scan for relevant details, but a few new details have also
been added:

  1. For channel, the format is now explained in the same format as in
    concepts/toolchains.md, but with the more limited form that
    rust-toolchain.toml accepts. This is based on the text that was
    here previously; I haven't verified if the code is actually this
    strict.
  2. The profile section mentions that the default profile is not
    necessarily the profile named default, which is subtle detail that
    can be confusing.
  3. The components section notes that the list is additive with the
    profile's list of components.
  4. The targets field is now documented, previously it wasn't mentioned
    other than to say it's ignored with path.

doc/src/overrides.md Outdated Show resolved Hide resolved
The format of the new section is modeled after the cargo docs, for example:
https://doc.rust-lang.org/cargo/reference/profiles.html#profile-settings

This is mostly a reorganization of the existing content to make it
easier to scan for relevant details, but a few new details have also
been added:

1. For `channel`, the format is now explained in the same format as in
   concepts/toolchains.md, but with the more limited form that
   `rust-toolchain.toml` accepts. This is based on the text that was
   here previously; I haven't verified if the code is actually this
   strict.
2. The `profile` section mentions that the default profile is not
   necessarily the profile named `default`, which is subtle detail that
   can be confusing.
3. The `components` section notes that the list is additive with the
   profile's list of components.
4. The `targets` field is now documented, previously it wasn't mentioned
   other than to say it's ignored with `path`.
Copy link
Member

@Rustin170506 Rustin170506 left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for your patch!
But I am not a native English speaker, so I'd like to wait for approval from @kinnison or @rbtcollins before we merge it.

@Rustin170506
Copy link
Member

You can check out this rendered page.

@nicholasbishop
Copy link
Contributor Author

Friendly ping, would love to get this merged :)

@Rustin170506
Copy link
Member

I am going to merge this PR. If we find some grammar issues we can fix them later. Thanks! Sorry for the long wait.

@Rustin170506 Rustin170506 merged commit a223e5a into rust-lang:master Dec 27, 2022
@nicholasbishop nicholasbishop deleted the bishop-specify-additive branch December 27, 2022 17:58
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.

2 participants