diff options
| author | bors <bors@rust-lang.org> | 2019-09-29 06:08:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-29 06:08:50 +0000 |
| commit | fe2f7e0e5350a431e00e72cfd00df2669f94fe06 (patch) | |
| tree | 612c17e3a2c2f7815be281b5be840aec1a50353a /src/test/rustdoc/variadic.rs | |
| parent | 0bbab7d99dde8620604fb265706dc8bff20345a7 (diff) | |
| parent | 0d4afa164bd1146eeba957dfe5a784624038bc3a (diff) | |
| download | rust-fe2f7e0e5350a431e00e72cfd00df2669f94fe06.tar.gz rust-fe2f7e0e5350a431e00e72cfd00df2669f94fe06.zip | |
Auto merge of #64886 - Centril:rollup-30dqh8j, r=Centril
Rollup of 5 pull requests Successful merges: - #63492 (Remove redundancy from the implementation of C variadics.) - #64589 (Differentiate AArch64 bare-metal targets between hf and non-hf.) - #64799 (Fix double panic when printing query stack during an ICE) - #64824 (No StableHasherResult everywhere) - #64884 (Add pkg-config to dependency list if building for Linux on Linux) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc/variadic.rs')
| -rw-r--r-- | src/test/rustdoc/variadic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/rustdoc/variadic.rs b/src/test/rustdoc/variadic.rs index 5af2aea21fc..bd8f1775b3d 100644 --- a/src/test/rustdoc/variadic.rs +++ b/src/test/rustdoc/variadic.rs @@ -1,4 +1,4 @@ extern "C" { - // @has variadic/fn.foo.html //pre 'pub unsafe extern "C" fn foo(x: i32, _: ...)' + // @has variadic/fn.foo.html //pre 'pub unsafe extern "C" fn foo(x: i32, ...)' pub fn foo(x: i32, ...); } |