diff options
| author | bors <bors@rust-lang.org> | 2018-03-09 03:59:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-09 03:59:42 +0000 |
| commit | 2079a084df08c38eb4dbfc5c8de5c0245170c3d9 (patch) | |
| tree | 0fcabcc7de8c86c92497c331b5be41f45f79a579 /src/libstd | |
| parent | 604d4ce7577b07b73d115c94fbd8007c1d9c9335 (diff) | |
| parent | b65b171f4433eb14b317c877ac84e4455caec837 (diff) | |
| download | rust-2079a084df08c38eb4dbfc5c8de5c0245170c3d9.tar.gz rust-2079a084df08c38eb4dbfc5c8de5c0245170c3d9.zip | |
Auto merge of #48860 - Manishearth:rollup, r=Manishearth
Rollup of 5 pull requests - Successful merges: #48527, #48588, #48801, #48856, #48857 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index a18c811d196..b804cf7cd90 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -472,7 +472,7 @@ pub mod builtin { /// The expanded expression has type `u32` and is 1-based, so the first line /// in each file evaluates to 1, the second to 2, etc. This is consistent /// with error messages by common compilers or popular editors. - /// The returned line is not the invocation of the `line!` macro itself, + /// The returned line is *not necessarily* the line of the `line!` invocation itself, /// but rather the first macro invocation leading up to the invocation /// of the `line!` macro. /// @@ -497,7 +497,7 @@ pub mod builtin { /// The expanded expression has type `u32` and is 1-based, so the first column /// in each line evaluates to 1, the second to 2, etc. This is consistent /// with error messages by common compilers or popular editors. - /// The returned column is not the invocation of the `column!` macro itself, + /// The returned column is *not necessarily* the line of the `column!` invocation itself, /// but rather the first macro invocation leading up to the invocation /// of the `column!` macro. /// |