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

Search box #54281

Merged
merged 1 commit into from
Sep 26, 2018
Merged

Search box #54281

merged 1 commit into from
Sep 26, 2018

Conversation

GuillaumeGomez
Copy link
Member

Follow up of #54244.

r? @QuietMisdreavus

screen shot 2018-09-16 at 21 23 05

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
[00:53:50] ....................................................................................................
[00:53:52] .....................................................i..............................................
[00:53:55] ....................................................................................................
[00:53:58] ....................................................................................................
[00:54:01] .iiiiiiiii..........................................................................................
[00:54:07] ....................................................................................................
[00:54:10] ..................................................................................i.................
[00:54:13] ....................................................................................................
[00:54:16] ....................................i.i..ii.........................................................
---
[01:29:26] 17 
[01:29:26] - note: rustc 1.30.0-dev running on x86_64-apple-darwin
[01:29:26] + note: rustc 1.30.0-dev running on x86_64-unknown-linux-gnu
[01:29:26] 19 
[01:29:26] 20 note: compiler flags: -Z ui-testing -Z unstable-options -Z treat-err-as-bug
[01:29:26] 
[01:29:26] 
[01:29:26] The actual stderr differed from the expected stderr.
[01:29:26] The actual stderr differed from the expected stderr.
[01:29:26] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/treat-err-as-bug/treat-err-as-bug.stderr
[01:29:26] To update references, rerun the tests and pass the `--bless` flag
[01:29:26] To only update this specific test, also pass `--test-args treat-err-as-bug.rs`
[01:29:26] error: 1 errors occurred comparing output.
[01:29:26] status: exit code: 1
[01:29:26] status: exit code: 1
[01:29:26] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "/checkout/src/test/rustdoc-ui/treat-err-as-bug.rs" "--target=x86_64-unknown-linux-gnu" "-Zui-testing" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/treat-err-as-bug/a" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Ztreat-err-as-bud completed unsuccessfully in 0:44:19
[01:29:26] Makefile:58: recipe for target 'check' failed
[01:29:26] make: *** [check] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1764ff5c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

QuietMisdreavus
QuietMisdreavus suggested changes Sep 17, 2018
View reviewed changes
src/doc/index.md Outdated
<input type="search" name="search"/>
<button>Search</button>
<input id="search-input" type="search" name="search"
placeholder="Search into the standard library!"/>
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer something like "Search through the standard library" (without the exclamation mark), though i'm welcome to a second opinion from @rust-lang/docs.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes sir!

src/librustdoc/lib.rs Outdated
@@ -404,8 +404,11 @@ fn main_args(args: &[String]) -> isize {
`short` (instead was `{}`)", arg));
}
};
let treat_err_as_bug = matches.opt_strs("Z").iter().any(|x| {
*x == "treat-err-as-bug"
});
Copy link
Member

Choose a reason for hiding this comment

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

This branch includes your -Z treat-err-as-bug branch as well. Please remove that commit from this branch.

Copy link
Member Author

Choose a reason for hiding this comment

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

Woups, indeed!

@GuillaumeGomez
Copy link
Member Author

Updated.

@QuietMisdreavus
Copy link
Member

Unless someone from docs comes up with a better search-box placeholder text, r=me if travis is green.

@GuillaumeGomez
Copy link
Member Author

@bors: r=QuietMisdreavus rollup

@bors
Copy link
Contributor

bors commented Sep 22, 2018

📌 Commit 9d5ca39 has been approved by QuietMisdreavus

@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 Sep 22, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Sep 25, 2018
@pietroalbini
Rollup merge of rust-lang#54281 - GuillaumeGomez:search-box, r=QuietM…
888a034 
…isdreavus

Search box

Follow up of rust-lang#54244.

r? @QuietMisdreavus

<img width="1440" alt="screen shot 2018-09-16 at 21 23 05" src="https://user-images.githubusercontent.com/3050060/45600056-cbf93380-b9f6-11e8-904a-d76ddbc5ed69.png">
@pietroalbini pietroalbini mentioned this pull request Sep 25, 2018
Merged
bors added a commit that referenced this pull request Sep 25, 2018
@bors
Auto merge of #54575 - pietroalbini:rollup, r=pietroalbini
92aff72 
Rollup of 12 pull requests

Successful merges:

 - #53518 (Add doc for impl From in char_convert)
 - #54058 (Introduce the partition_dedup/by/by_key methods for slices)
 - #54281 (Search box)
 - #54368 (Reduce code block sides padding)
 - #54498 (The project moved under the Mozilla umbrella)
 - #54518 (resolve: Do not block derive helper resolutions on single import resolutions)
 - #54522 (Fixed three small typos.)
 - #54529 (aarch64-pc-windows-msvc: Don't link libpanic_unwind to libtest.)
 - #54537 (Rename slice::exact_chunks() to slice::chunks_exact())
 - #54539 (Fix js error)
 - #54557 (incr.comp.: Don't automatically enable -Zshare-generics for incr. comp. builds.)
 - #54558 (Improvements to finding LLVM's FileCheck)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 26, 2018

☔ The latest upstream changes (presumably #54575) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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 Sep 26, 2018
@bors bors merged commit 9d5ca39 into rust-lang:master Sep 26, 2018
@GuillaumeGomez GuillaumeGomez deleted the search-box branch September 26, 2018 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuietMisdreavus QuietMisdreavus QuietMisdreavus approved these changes

Assignees

@QuietMisdreavus QuietMisdreavus

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @rust-highfive @QuietMisdreavus @bors