bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #78976 - GuillaumeGomez:rollup-endkih3, r=GuillaumeGomez

Browse source 
Rollup of 5 pull requests

Successful merges:

 - #78916 (extend const generics test suite)
 - #78921 (Improve the page title switch handling between search and doc)
 - #78933 (Don't print thread ids and names in `tracing` logs)
 - #78960 (Test default values for const parameters.)
 - #78971 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2020-11-12 13:10:07 +00:00
commit 7f5a42b073
33 changed files with 1165 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/html/static/main.js
View file

@ -113,6 +113,7 @@ function defocusSearchBar() {
var mouseMovedAfterSearch = true;
var titleBeforeSearch = document.title;
var searchTitle = null;
function clearInputTimeout() {
if (searchTimeout !== null) {
@ -169,6 +170,7 @@ function defocusSearchBar() {
addClass(main, "hidden");
removeClass(search, "hidden");
mouseMovedAfterSearch = false;
document.title = searchTitle;
}
function hideSearchResults(search) {
@ -177,6 +179,7 @@ function defocusSearchBar() {
}
addClass(search, "hidden");
removeClass(main, "hidden");
document.title = titleBeforeSearch;
}
// used for special search precedence
@ -374,7 +377,6 @@ function defocusSearchBar() {
clearInputTimeout();
ev.preventDefault();
hideSearchResults(search);
document.title = titleBeforeSearch;
}
defocusSearchBar();
hideThemeButtonState();
@ -1791,7 +1793,7 @@ function defocusSearchBar() {
}
// Update document title to maintain a meaningful browser history
document.title = "Results for " + query.query + " - Rust";
searchTitle = "Results for " + query.query + " - Rust";
// Because searching is incremental by character, only the most
// recent search query is added to the browser history.
@ -2745,6 +2747,7 @@ function defocusSearchBar() {
"",
"?search=" + encodeURIComponent(search_input.value));
}
document.title = searchTitle;
}
}