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.

Sign up for GitHub

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

Jump to bottom

Fix type name in doc example for Iter and IterMut #80791

Merged
merged 2 commits into from
Jan 8, 2021
Merged

Fix type name in doc example for Iter and IterMut #80791

merged 2 commits into from
Jan 8, 2021

Conversation

mrcz
Copy link

@mrcz mrcz commented Jan 7, 2021

No description provided.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @withoutboats (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 Jan 7, 2021
jyn514
jyn514 reviewed Jan 7, 2021
View reviewed changes
library/core/src/slice/iter.rs Outdated
@@ -51,7 +51,7 @@ fn size_from_ptr<T>(_: *const T) -> usize {
/// Basic usage:
///
/// ```
/// // First, we declare a type which has `iter` method to get the `Iter` struct (&[usize here]):
/// // First, we declare a type which has `iter` method to get the `Iter` struct (&[usize] here):
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/// // First, we declare a type which has `iter` method to get the `Iter` struct (&[usize] here):
/// // First, we declare a type which has `iter` method to get the `Iter` struct (`&[usize]` here):

library/core/src/slice/iter.rs Outdated
@@ -112,7 +112,7 @@ impl<'a, T> Iter<'a, T> {
///
/// ```
/// // First, we declare a type which has the `iter` method to get the `Iter`
/// // struct (&[usize here]):
/// // struct (&[usize] here):
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/// // struct (&[usize] here):
/// // struct (`&[usize]` here):

library/core/src/slice/iter.rs Outdated
@@ -167,7 +167,7 @@ impl<T> AsRef<[T]> for Iter<'_, T> {
///
/// ```
/// // First, we declare a type which has `iter_mut` method to get the `IterMut`
/// // struct (&[usize here]):
/// // struct (&[usize] here):
Copy link
Member

Choose a reason for hiding this comment

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

... and so on

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure:

@jyn514
Copy link
Member

jyn514 commented Jan 7, 2021

@bors r+ rollup

Thanks!

@bors
Copy link
Contributor

bors commented Jan 7, 2021

📌 Commit 358ef56 has been approved by jyn514

@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 Jan 7, 2021
@JohnTitor JohnTitor mentioned this pull request Jan 8, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2021
@bors
Auto merge of rust-lang#80806 - JohnTitor:rollup-y64z7ph, r=JohnTitor
9155a9d 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#79675 (Make sure rust-call errors occur correctly for traits)
 - rust-lang#80372 (Don't panic when an external crate can't be resolved)
 - rust-lang#80761 (handle generic trait methods in coverage-report tests)
 - rust-lang#80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`)
 - rust-lang#80791 (Fix type name in doc example for Iter and IterMut)
 - rust-lang#80794 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
 - rust-lang#80799 (Get rid of custom pretty-printing in rustdoc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1ed90e4 into rust-lang:master Jan 8, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

Assignees

@withoutboats withoutboats

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.
7 participants
@mrcz @rust-highfive @rust-log-analyzer @jyn514 @bors @withoutboats @rustbot