Skip to content

Mention where std::vec structs originate from. #34818

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

Merged
merged 1 commit into from
Jul 15, 2016
Merged

Conversation

frewsxcv
Copy link
Member

No description provided.

@frewsxcv
Copy link
Member Author

r? @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 14, 2016

📌 Commit 528de81 has been approved by GuillaumeGomez

@TimNN
Copy link
Contributor

TimNN commented Jul 14, 2016

This patch causes a link check failure, see #34819.

Excerpt from the log:

Linkcheck stage2 (x86_64-pc-windows-msvc)
collections\vec\struct.IntoIter.html:55: broken link - collections\vec\provided by
the [`IntoIterator`] trait
std\vec\struct.IntoIter.html:55: broken link - std\vec\provided by
the [`IntoIterator`] trait


command did not execute successfully: "C:\\bot\\slave\\auto-win-msvc-64-opt-rustbuild\\build\\obj\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\linkchecker.exe" "C:\\bot\\slave\\auto-win-msvc-64-opt-rustbuild\\build\\obj\\build\\x86_64-pc-windows-msvc\\doc"
expected success, got: exit code: 101

@frewsxcv
Copy link
Member Author

Fixed in the latest force push.

diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index f6861c0..b51b971 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -1604,8 +1604,8 @@ impl<'a, T> FromIterator<T> for Cow<'a, [T]> where T: Clone {

 /// An iterator that moves out of a vector.
 ///
-/// This `struct` is created by the `into_iter` method on [`Vec`] (provided by
-/// the [`IntoIterator`] trait).
+/// This `struct` is created by the `into_iter` method on [`Vec`][`Vec`] (provided
+/// by the [`IntoIterator`] trait).
 ///
 /// [`Vec`]: struct.Vec.html
 /// [`IntoIterator`]: ../iter/trait.IntoIterator.html

/// by the [`IntoIterator`] trait).
///
/// [`Vec`]: struct.Vec.html
/// [`IntoIterator`]: ../iter/trait.IntoIterator.html
Copy link
Member

Choose a reason for hiding this comment

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

You'll need to change this to ../../std/iter/trait.IntoIterator.html so the link works from the collections docs as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good call, didn't think about the collection docs getting generated. Will force push shortly.

Copy link
Member Author

Choose a reason for hiding this comment

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

Latest force push includes this change.

@GuillaumeGomez
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 15, 2016

📌 Commit cf21a7b has been approved by GuillaumeGomez

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 15, 2016
Mention where `std::vec` structs originate from.

None
bors added a commit that referenced this pull request Jul 15, 2016
Rollup of 7 pull requests

- Successful merges: #34456, #34733, #34777, #34794, #34799, #34804, #34818
- Failed merges: #33951
@bors bors merged commit cf21a7b into rust-lang:master Jul 15, 2016
@frewsxcv frewsxcv deleted the vecdoc branch July 15, 2016 15:50
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.

5 participants