Skip to content

Add more elements in the sidebar #45766

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
Nov 8, 2017

Conversation

GuillaumeGomez
Copy link
Member

Fixes #45740.

r? @rust-lang/docs

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 5, 2017
// @has - '//*[@class="sidebar-links"]/a' 'foo'
// @has - '//*[@class="sidebar-title"]/a' 'Associated Constants'
// @has - '//*[@class="sidebar-links"]/a' 'BAR'
// @has - '//*[@class="sidebar-title"]/a' 'Associated Types'
Copy link
Member

Choose a reason for hiding this comment

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

[00:59:22] 14: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Required Methods'
[00:59:22] 16: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Provided Methods'
[00:59:22] 18: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Associated Constants'
[00:59:22] 20: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Associated Types'
[00:59:22] 31: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Fields'
[00:59:22] 41: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Variants'
[00:59:22] 50: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-title"]/a' 'Fields'
[00:59:22] 52: @has check failed
[00:59:22] 	`XPATH PATTERN` did not match
[00:59:22] 	// @has - '//*[@class="sidebar-links"]/a' 'u'

@GuillaumeGomez GuillaumeGomez force-pushed the trait-methods-list branch 3 times, most recently from ef9b7ed to 18af3eb Compare November 5, 2017 21:59
@GuillaumeGomez
Copy link
Member Author

Working!

@@ -3547,6 +3547,10 @@ fn small_url_encode(s: &str) -> String {
.replace("]", "%5D")
}

fn small_html_encode(s: &str) -> String {
Copy link
Member

Choose a reason for hiding this comment

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

Why aren't you using Escape? &s appear in type parameters for impls so need to be escaped which Escape will handle but this doens't.

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't understand the second part of your comment (and to answer the first, I didn't know it existed, I'll update!).

Copy link
Member

Choose a reason for hiding this comment

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

impl<'a> Add<&'a i32> for i32 is a valid thing to attempt to print, so the & in there should be escaped properly in the html.

@QuietMisdreavus
Copy link
Member

r=me with @ollie27's comment (and with travis)

@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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 7, 2017
@GuillaumeGomez
Copy link
Member Author

Updated, let's wait for travis now.

@GuillaumeGomez
Copy link
Member Author

Updated.

@kennytm
Copy link
Member

kennytm commented Nov 8, 2017

@bors r=QuietMisdreavus

Travis is green and the code is now using Escape.

@bors
Copy link
Collaborator

bors commented Nov 8, 2017

📌 Commit ac398a3 has been approved by QuietMisdreavus

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2017
…r=QuietMisdreavus

Add more elements in the sidebar

Fixes rust-lang#45740.

r? @rust-lang/docs
bors added a commit that referenced this pull request Nov 8, 2017
Rollup of 4 pull requests

- Successful merges: #45582, #45766, #45830, #45849
- Failed merges:
@bors bors merged commit ac398a3 into rust-lang:master Nov 8, 2017
@GuillaumeGomez GuillaumeGomez deleted the trait-methods-list branch November 8, 2017 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants