about summary refs log tree commit diff
path: root/src/librustdoc/html/static
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-11 19:29:38 +0000
committerbors <bors@rust-lang.org>2020-08-11 19:29:38 +0000
commite5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c (patch)
tree2400d5f1c2b7830eb3ccb38bb3837ca128159421 /src/librustdoc/html/static
parentcbe7c5ce705896d4e22bf6096590bc1f17993b78 (diff)
parent5d9a0b020c8f85c78b4bb7071e993a9d00db07e7 (diff)
downloadrust-e5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c.tar.gz
rust-e5e33ebd2ba12a78dbf6e2d5f154d5f71f28576c.zip
Auto merge of #75421 - tmandry:rollup-ctzmzn1, r=tmandry
Rollup of 7 pull requests

Successful merges:

 - #75036 (Prefer pattern matching over indexing)
 - #75378 (Introduce `rustc_lexer::is_ident` and use it in couple of places)
 - #75393 (Fully handle "?" shortcut)
 - #75403 (Update comment for function)
 - #75407 (Requested changes to [*mut T|*const T]::set_ptr_value)
 - #75408 (Update MinGW comments in ci.yml)
 - #75409 (Fix range term in alloc vec doc)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustdoc/html/static')
-rw-r--r--src/librustdoc/html/static/main.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 63853e7394b..462a696dee6 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -408,9 +408,7 @@ function defocusSearchBar() {
                 break;
 
             case "?":
-                if (ev.shiftKey) {
-                    displayHelp(true, ev);
-                }
+                displayHelp(true, ev);
                 break;
             }
         }