bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #47678 - kennytm:rollup, r=kennytm

Browse source 
Rollup of 14 pull requests

- Successful merges: #47423, #47425, #47440, #47541, #47549, #47554, #47558, #47610, #47635, #47655, #47661, #47662, #47667, #47672
- Failed merges:
This commit is contained in:
bors 2018-01-23 16:13:18 +00:00
commit 4e3901d35f
38 changed files with 302 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,7 @@
var lev_distance = MAX_LEV_DISTANCE + 1;
if (obj.name === val.name) {
if (literalSearch === true) {
if (val.generics.length !== 0) {
if (val.generics && val.generics.length !== 0) {
if (obj.generics && obj.length >= val.generics.length) {
var elems = obj.generics.slice(0);
var allFound = true;
@ -645,7 +645,7 @@
}
// Names didn't match so let's check if one of the generic types could.
if (literalSearch === true) {
if (obj.generics.length > 0) {
if (obj.generics && obj.generics.length > 0) {
for (var x = 0; x < obj.generics.length; ++x) {
if (obj.generics[x] === val.name) {
return true;