Skip to content

/rust

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

Rustdoc: add crate items to the search-index #31715

Merged
merged 2 commits into from Feb 23, 2016

Conversation

Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@mitaa @rust-highfive @alexcrichton @bors @cmr
@mitaa
Copy link
Contributor

mitaa commented Feb 16, 2016

This allows to search for crates in documentation and simplifies the json serialization of the search-index.

fixes #14077

@rust-highfive rust-highfive assigned cmr Feb 16, 2016

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Feb 16, 2016

r? @cmr

(rust_highfive has picked a reviewer for you, use r? to override)
@mitaa

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mitaa commented Feb 16, 2016

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned cmr Feb 16, 2016

src/librustdoc/html/render.rs Outdated
fn to_json(&self) -> Json {
let mut data = BTreeMap::new();
data.insert("name".to_owned(), self.name.to_json());
Json::Object(data)

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Feb 22, 2016

Member

This seems different than it was before? Just double-checking that it was accounted for on the search index side of things
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 22, 2016

Sorry this took awhile to get around to, but thanks @mitaa! I like the cleanup going on here, definitely improves readability.

I've got just one minor question about how the search index looks like it's changed, but other than that looks good to me.

@mitaa mitaa force-pushed the mitaa:rdoc-index-crate branch from e743770 to 81f673d Feb 22, 2016

@mitaa

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mitaa commented Feb 22, 2016

You're right, I've changed that part back to the old behaviour - the search index shouldn't have changed but it's probably safer this way. (like the comment said the null case shouldn't normally happen)
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 22, 2016

@bors: r+ 81f673d

bors added a commit that referenced this pull request Feb 22, 2016

@bors
Auto merge of #31715 - mitaa:rdoc-index-crate, r=alexcrichton 
This allows to search for crates in documentation and simplifies the json serialization of the search-index.

fixes #14077
37c6f28
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 22, 2016

⌛️ Testing commit 81f673d with merge 37c6f28...
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 23, 2016

💔 Test failed - auto-win-gnu-64-nopt-t
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 23, 2016

@bors: retry

On Mon, Feb 22, 2016 at 4:51 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-gnu-64-nopt-t
http://buildbot.rust-lang.org/builders/auto-win-gnu-64-nopt-t/builds/3199

—
Reply to this email directly or view it on GitHub
#31715 (comment).
@bors
@bors

@bors bors merged commit 81f673d into rust-lang:master Feb 23, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@mitaa mitaa deleted the mitaa:rdoc-index-crate branch Feb 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.