diff options
| author | bors <bors@rust-lang.org> | 2022-05-29 23:25:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-29 23:25:51 +0000 |
| commit | 6999ef25645dcfcfd4e7092e448385ab3b73e44c (patch) | |
| tree | e7baaf3605d6b842b2322d91538c6528204241c9 /src | |
| parent | 28b891916d4c85cd10fb2e9cfa8bc836a2c459f3 (diff) | |
| parent | f20bbc1fb0a4812b6e51eef52908a635d47bb394 (diff) | |
| download | rust-6999ef25645dcfcfd4e7092e448385ab3b73e44c.tar.gz rust-6999ef25645dcfcfd4e7092e448385ab3b73e44c.zip | |
Auto merge of #97538 - compiler-errors:rollup-zp3ukke, r=compiler-errors
Rollup of 4 pull requests Successful merges: - #97493 (Use `type_is_copy_modulo_regions` check in intrisicck) - #97518 (Fix order of closing HTML elements in rustdoc output) - #97530 (Add more eslint checks) - #97536 (Remove unused lifetimes from expand_macro) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/static/.eslintrc.js | 7 | ||||
| -rw-r--r-- | src/test/ui/asm/issue-97490.rs | 12 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index eefb2c2358f..b8d6b340b14 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1764,7 +1764,7 @@ fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Buffer) { write!(buffer, "<li class=\"version\">Version {}</li>", Escape(version)); } write!(buffer, "<li><a id=\"all-types\" href=\"all.html\">All Items</a></li>"); - buffer.write_str("</div></ul>"); + buffer.write_str("</ul></div>"); } match *it.kind { diff --git a/src/librustdoc/html/static/.eslintrc.js b/src/librustdoc/html/static/.eslintrc.js index 997def1657f..f66ecbf78af 100644 --- a/src/librustdoc/html/static/.eslintrc.js +++ b/src/librustdoc/html/static/.eslintrc.js @@ -63,5 +63,12 @@ module.exports = { } ], "eqeqeq": "error", + "no-const-assign": "error", + "no-debugger": "error", + "no-dupe-args": "error", + "no-dupe-else-if": "error", + "no-dupe-keys": "error", + "no-duplicate-case": "error", + "no-ex-assign": "error", } }; diff --git a/src/test/ui/asm/issue-97490.rs b/src/test/ui/asm/issue-97490.rs new file mode 100644 index 00000000000..37862cf349c --- /dev/null +++ b/src/test/ui/asm/issue-97490.rs @@ -0,0 +1,12 @@ +// check-pass +// only-x86_64 +// needs-asm-support + +pub type Yes = extern "sysv64" fn(&'static u8) -> !; + +fn main() { + unsafe { + let yes = &6 as *const _ as *const Yes; + core::arch::asm!("call {}", in(reg) yes, options(noreturn)); + } +} |
