diff options
| author | bors <bors@rust-lang.org> | 2015-11-28 16:22:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-28 16:22:27 +0000 |
| commit | 5ea65c03d96875a41c556ccd949617d4830e0ee9 (patch) | |
| tree | 4dd1789bb93905906f41445599b20f620a57dd7b /src/test/rustdoc | |
| parent | 9e05951f1f9493a3a397ae93cd5be51ec4659cde (diff) | |
| parent | ff339bd6f906754bbb6e2e249322a5bc79433329 (diff) | |
| download | rust-5ea65c03d96875a41c556ccd949617d4830e0ee9.tar.gz rust-5ea65c03d96875a41c556ccd949617d4830e0ee9.zip | |
Auto merge of #30074 - jonas-schievink:macro-doc, r=sanxiyn
Fixes #17616
New docs for `panic!`:
```rust
macro_rules! panic {
() => { ... };
($msg:expr) => { ... };
($fmt:expr, $($arg:tt)+) => { ... };
}
```
New docs for `assert!`:
```rust
macro_rules! assert {
( $ cond : expr ) => { ... };
(
$ cond : expr , $ ( $ arg : tt ) + ) => { ... };
}
```
<sup>not pretty, but at least it's not worse :joy:
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/macros.rs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/test/rustdoc/macros.rs b/src/test/rustdoc/macros.rs new file mode 100644 index 00000000000..b052ad2da2f --- /dev/null +++ b/src/test/rustdoc/macros.rs @@ -0,0 +1,20 @@ +// Copyright 2015 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. + +// @has macros/macro.my_macro!.html //pre 'macro_rules! my_macro {' +// @has - //pre '() => { ... };' +// @has - //pre '($a:tt) => { ... };' +// @has - //pre '($e:expr) => { ... };' +#[macro_export] +macro_rules! my_macro { + () => []; + ($a:tt) => (); + ($e:expr) => {}; +} |
