diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-05-03 22:20:57 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-05-05 12:44:10 +0200 |
| commit | d0840fd63bcbb3aa8dd43d83a2fe275b00e94f6d (patch) | |
| tree | eefea1bb1f38eeee744b534ffc46dfee53eb8d15 | |
| parent | fc6b2c5fefa3e8793a5cab00a2d354d79137a306 (diff) | |
| download | rust-d0840fd63bcbb3aa8dd43d83a2fe275b00e94f6d.tar.gz rust-d0840fd63bcbb3aa8dd43d83a2fe275b00e94f6d.zip | |
Fix paths search
| -rw-r--r-- | src/librustdoc/html/static/main.js | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-js/pinbox-new.js | 18 | ||||
| -rw-r--r-- | src/test/rustdoc-js/vec-new.js | 19 |
3 files changed, 38 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 6d80145b29c..8569abeb09c 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -993,7 +993,7 @@ Math.min(results_returned[fullId].lev, returned); } if (index !== -1 || lev <= MAX_LEV_DISTANCE) { - if (index !== -1) { + if (index !== -1 && paths.length < 2) { lev = 0; } if (results[fullId] === undefined) { diff --git a/src/test/rustdoc-js/pinbox-new.js b/src/test/rustdoc-js/pinbox-new.js new file mode 100644 index 00000000000..9d2bf1b4551 --- /dev/null +++ b/src/test/rustdoc-js/pinbox-new.js @@ -0,0 +1,18 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +const QUERY = 'pinbox::new'; + +const EXPECTED = { + 'others': [ + { 'path': 'std::boxed::PinBox', 'name': 'new' }, + { 'path': 'alloc::boxed::PinBox', 'name': 'new' }, + ], +}; diff --git a/src/test/rustdoc-js/vec-new.js b/src/test/rustdoc-js/vec-new.js new file mode 100644 index 00000000000..702953e2e9d --- /dev/null +++ b/src/test/rustdoc-js/vec-new.js @@ -0,0 +1,19 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +const QUERY = 'Vec::new'; + +const EXPECTED = { + 'others': [ + { 'path': 'std::vec::Vec', 'name': 'new' }, + { 'path': 'std::vec::Vec', 'name': 'ne' }, + { 'path': 'std::boxed::PinBox', 'name': 'new' }, + ], +}; |
