diff options
| author | bors <bors@rust-lang.org> | 2022-09-13 21:05:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-13 21:05:21 +0000 |
| commit | 17cbdfd07178349d0a3cecb8e7dde8f915666ced (patch) | |
| tree | c873d712775ce17d869b73d02f2eecc649519c78 /src/test | |
| parent | c84083b08e2db69fcf270c4045837fa02663a3bf (diff) | |
| parent | f04eee11578b31b0618e854873c21ce5c453f52c (diff) | |
| download | rust-17cbdfd07178349d0a3cecb8e7dde8f915666ced.tar.gz rust-17cbdfd07178349d0a3cecb8e7dde8f915666ced.zip | |
Auto merge of #101777 - matthiaskrgr:rollup-x2dyaa2, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #101266 (translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Final) - #101737 (rustdoc: remove no-op CSS `.search-results .result-name > span`) - #101752 (Improve Attribute doc methods) - #101754 (Fix doc of log function) - #101759 (:arrow_up: rust-analyzer) - #101765 (Add documentation for TyCtxt::visibility) - #101770 (Rustdoc-Json: Don't loose subitems of foreign traits.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rustdoc-gui/search-result-display.goml | 3 | ||||
| -rw-r--r-- | src/test/rustdoc-json/traits/uses_extern_trait.rs | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/test/rustdoc-gui/search-result-display.goml b/src/test/rustdoc-gui/search-result-display.goml index 54482005fa6..efbbfb925bd 100644 --- a/src/test/rustdoc-gui/search-result-display.goml +++ b/src/test/rustdoc-gui/search-result-display.goml @@ -13,6 +13,9 @@ size: (600, 100) // when computed it's larger. assert-css: (".search-results div.desc", {"width": "566px"}) +// The result set is all on one line. +assert-css: (".search-results .result-name > span", {"display": "inline"}) + // Check that the crate filter `<select>` is correctly handled when it goes to next line. // To do so we need to update the length of one of its `<option>`. size: (900, 900) diff --git a/src/test/rustdoc-json/traits/uses_extern_trait.rs b/src/test/rustdoc-json/traits/uses_extern_trait.rs new file mode 100644 index 00000000000..430dd1543f5 --- /dev/null +++ b/src/test/rustdoc-json/traits/uses_extern_trait.rs @@ -0,0 +1,7 @@ +#![no_std] +pub fn drop_default<T: core::default::Default>(_x: T) {} + +// FIXME(adotinthevoid): Theses shouldn't be here +// @has "$.index[*][?(@.name=='Debug')]" +// @set Debug_fmt = "$.index[*][?(@.name=='Debug')].inner.items[*]" +// @has "$.index[*][?(@.name=='fmt')].id" $Debug_fmt |