Skip to content

rustdoc: Remove methods from #[doc(masked)] crates from the search index #47675

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 2 commits into from
Jan 26, 2018

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 23, 2018

@kennytm
Copy link
Member

kennytm commented Jan 23, 2018

Could you verify if this fixes #44740?

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 23, 2018
@ollie27
Copy link
Member Author

ollie27 commented Jan 23, 2018

Indeed it does.

@QuietMisdreavus
Copy link
Member

@bors r+ rollup

Thanks!

@bors
Copy link
Collaborator

bors commented Jan 23, 2018

📌 Commit 2e81ce7 has been approved by QuietMisdreavus

@kennytm kennytm 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 23, 2018
@kennytm
Copy link
Member

kennytm commented Jan 25, 2018

@bors r-

Not your fault, but unfortunately a test case is invalid, causing failure after the bug is fixed. Please apply the following diff:

diff --git a/src/test/rustdoc-js/from_u.js b/src/test/rustdoc-js/from_u.js
index 0296788f7a..34b98a758d 100644
--- a/src/test/rustdoc-js/from_u.js
+++ b/src/test/rustdoc-js/from_u.js
@@ -15,7 +15,5 @@ const EXPECTED = {
         { 'path': 'std::char', 'name': 'from_u32' },
         { 'path': 'std::str', 'name': 'from_utf8' },
         { 'path': 'std::string::String', 'name': 'from_utf8' },
-        { 'path': 'std::i32', 'name': 'from_unsigned' },
-        { 'path': 'std::i128', 'name': 'from_unsigned' },
     ],
 };

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 25, 2018
@kennytm
Copy link
Member

kennytm commented Jan 25, 2018

@bors r=QuietMisdreavus

@bors
Copy link
Collaborator

bors commented Jan 25, 2018

📌 Commit 77bc826 has been approved by QuietMisdreavus

@kennytm kennytm 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 25, 2018
@ollie27
Copy link
Member Author

ollie27 commented Jan 25, 2018

Is it possible for travis to run those tests automatically? They seem like they will be pretty fragile.

@kennytm
Copy link
Member

kennytm commented Jan 25, 2018

@ollie27 Those tests should be run automatically, but it seems the CI docker image is missing nodejs.

[01:37:12] No nodejs found, skipping "src/test/rustdoc-js" tests
[01:37:12] Build completed successfully in 0:56:39

cc @GuillaumeGomez

@bors bors merged commit 77bc826 into rust-lang:master Jan 26, 2018
@ollie27 ollie27 deleted the rustdoc_masked branch January 26, 2018 20:35
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.

4 participants