Skip to content

Rollup of 9 pull requests #93202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jan 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
528c4f9
Add PanicInfo::can_unwind which indicates whether a panic handler is
Amanieu Dec 18, 2021
fe9dc6e
Change TerminatorKind::Abort to call the panic handler instead of
Amanieu Jan 12, 2022
ecd39aa
Update pulldown-cmark version to fix markdown list issue
GuillaumeGomez Jan 17, 2022
80b26bd
Update dependencies
GuillaumeGomez Jan 19, 2022
8d0d023
Simplify use of `map_or`
oli-obk Jan 20, 2022
1521b53
Increase the format version of rustdoc-json-types
Urgau Jan 20, 2022
c55819a
Make stability interning follow the usual pattern.
nnethercote Jan 20, 2022
d46ed5d
Clarify some code relating to interning and types.
nnethercote Jan 21, 2022
d984287
Add L4Bender as linker variant
humenda Apr 3, 2018
24588e6
Old versions of Android generate SIGSEGV from libc::abort
Amanieu Jan 21, 2022
660d993
adapt L4Bender implementation
atopia May 31, 2021
29d6235
Gate `l4-bender` linker flavor
petrochenkov Jan 7, 2022
888332f
Reject unsupported naked functions
tmiasko Jan 21, 2022
beeba4b
Reject may_unwind option in naked functions
tmiasko Jan 21, 2022
78cee22
Add missing GUI test explanations
GuillaumeGomez Jan 21, 2022
2eb8bfc
rustdoc: remove dashed underline under main heading
jsha Jan 21, 2022
ffd199d
Rollup merge of #85967 - atopia:update-l4re-target, r=petrochenkov
matthiaskrgr Jan 22, 2022
9d7c8ed
Rollup merge of #92828 - Amanieu:unwind-abort, r=dtolnay
matthiaskrgr Jan 22, 2022
f8335d9
Rollup merge of #93012 - GuillaumeGomez:pulldown-list, r=camelid
matthiaskrgr Jan 22, 2022
2ecbc4b
Rollup merge of #93116 - rust-lang:oli-obk-patch-1, r=jackh726
matthiaskrgr Jan 22, 2022
45f5f34
Rollup merge of #93132 - Urgau:fix-rustdoc-json-format-version, r=oli…
matthiaskrgr Jan 22, 2022
5fd9c05
Rollup merge of #93147 - nnethercote:interner-cleanups, r=lcnr
matthiaskrgr Jan 22, 2022
a8f64c0
Rollup merge of #93153 - tmiasko:reject-unsupported-naked-functions, …
matthiaskrgr Jan 22, 2022
86c096e
Rollup merge of #93170 - GuillaumeGomez:gui-tests-explanations, r=jsha
matthiaskrgr Jan 22, 2022
19e414a
Rollup merge of #93172 - jsha:re-remove-line, r=camelid
matthiaskrgr Jan 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing GUI test explanations
  • Loading branch information
GuillaumeGomez committed Jan 21, 2022
commit 78cee22fb4c6c4b57a7e96b25e90ca50d67a3c3a
2 changes: 2 additions & 0 deletions src/test/rustdoc-gui/check_info_sign_position.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// This test checks the position of the information on the code blocks (like
// `compile_fail` or `ignore`).
goto: file://|DOC_PATH|/test_docs/index.html
goto: ./fn.check_list_code_block.html
// If the codeblock is the first element of the docblock, the information tooltip must have
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/code-sidebar-toggle.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This test checks that the source code pages sidebar toggle is working as expected.
goto: file://|DOC_PATH|/test_docs/index.html
click: ".srclink"
wait-for: "#sidebar-toggle"
Expand Down
2 changes: 2 additions & 0 deletions src/test/rustdoc-gui/escape-key.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// This test ensures that the "Escape" shortcut is handled correctly based on the
// current content displayed.
goto: file://|DOC_PATH|/test_docs/index.html
// First, we check that the search results are hidden when the Escape key is pressed.
write: (".search-input", "test")
Expand Down
2 changes: 1 addition & 1 deletion src/test/rustdoc-gui/font-weight.goml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
goto: file://|DOC_PATH|/lib2/struct.Foo.html
// This test checks that the font weight is correctly applied.
goto: file://|DOC_PATH|/lib2/struct.Foo.html
assert-css: ("//*[@class='docblock item-decl']//a[text()='Alias']", {"font-weight": "400"})
assert-css: (
"//*[@class='structfield small-section-header']//a[text()='Alias']",
Expand Down
4 changes: 2 additions & 2 deletions src/test/rustdoc-gui/huge-collection-of-constants.goml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
goto: file://|DOC_PATH|/test_docs/huge_amount_of_consts/index.html

// Make sure that the last two entries are more than 12 pixels apart and not stacked on each other.

goto: file://|DOC_PATH|/test_docs/huge_amount_of_consts/index.html

compare-elements-position-near-false: (
"//*[@class='item-table']//div[last()-1]",
"//*[@class='item-table']//div[last()-3]",
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/list_code_block.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This test checks that code blocks in list are supported.
goto: file://|DOC_PATH|/test_docs/index.html
goto: ./fn.check_list_code_block.html
assert: ("pre.rust.fn")
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/search-filter.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the crate search filtering is handled correctly and changes the results.
goto: file://|DOC_PATH|/test_docs/index.html
show-text: true
write: (".search-input", "test")
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/search-result-colors.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the result colors are as expected.
goto: file://|DOC_PATH|/test_docs/index.html
// We set the theme so we're sure that the correct values will be used, whatever the computer
// this test is running on.
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/search-result-display.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the search results have the expected width.
goto: file://|DOC_PATH|/test_docs/index.html
size: (900, 1000)
write: (".search-input", "test")
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/search-result-keyword.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the "keyword" results have the expected text alongside them.
goto: file://|DOC_PATH|/test_docs/index.html
write: (".search-input", "CookieMonster")
// Waiting for the search results to appear...
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Checks that the first non-empty search result tab is selected if the default/currently selected
// one is empty.
goto: file://|DOC_PATH|/test_docs/index.html
write: (".search-input", "Foo")
// Waiting for the search results to appear...
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/sidebar.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks multiple things on the sidebar display (width of its elements, colors, etc).
goto: file://|DOC_PATH|/test_docs/index.html
show-text: true
local-storage: {"rustdoc-theme": "light"}
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/source-code-page.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the interactions with the source code pages are workined as expected.
goto: file://|DOC_PATH|/src/test_docs/lib.rs.html
// Check that we can click on the line number.
click: ".line-numbers > span:nth-child(4)" // This is the span for line 4.
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/theme-change.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Ensures that the theme change is working as expected.
goto: file://|DOC_PATH|/test_docs/index.html
click: "#theme-picker"
click: "#theme-choices > button:first-child"
Expand Down
2 changes: 2 additions & 0 deletions src/test/rustdoc-gui/toggle-docs-mobile.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Checks that the documentation toggles on mobile have the correct position, style and work
// as expected.
goto: file://|DOC_PATH|/test_docs/struct.Foo.html
size: (433, 600)
assert-attribute: (".top-doc", {"open": ""})
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/toggle-docs.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the documentation toggles have the correct position, style and work as expected.
goto: file://|DOC_PATH|/test_docs/index.html
assert-attribute: ("#main-content > details.top-doc", {"open": ""})
assert-text: ("#toggle-all-docs", "[−]")
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc-gui/trait-sidebar-item-order.goml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Checks that the elements in the sidebar are alphabetically sorted.
goto: file://|DOC_PATH|/test_docs/trait.AnotherOne.html
assert-text: (".sidebar-links a:nth-of-type(1)", "another")
assert-text: (".sidebar-links a:nth-of-type(2)", "func1")
Expand Down