diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:14:40 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 13:27:02 -0800 |
| commit | 188d7c0bc36e69b99f6bdefd613027e53fa8b2d0 (patch) | |
| tree | 5605bccb8c49ba1baa92cc2132778403d16e58ce /src/liblog | |
| parent | 4c25687c2bf8d83f1e26bd6aad6d2eb807c5b254 (diff) | |
| parent | 7f64fe4e27555c256cb228feb05d4181a2287125 (diff) | |
| download | rust-188d7c0bc36e69b99f6bdefd613027e53fa8b2d0.tar.gz rust-188d7c0bc36e69b99f6bdefd613027e53fa8b2d0.zip | |
rollup merge of #21631: tbu-/isize_police
Conflicts: src/libcoretest/iter.rs
Diffstat (limited to 'src/liblog')
| -rw-r--r-- | src/liblog/lib.rs | 2 | ||||
| -rw-r--r-- | src/liblog/macros.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs index 0e2ab008e13..bf7fdaeadf4 100644 --- a/src/liblog/lib.rs +++ b/src/liblog/lib.rs @@ -20,7 +20,7 @@ //! error!("this is printed by default"); //! //! if log_enabled!(log::INFO) { -//! let x = 3i * 4i; // expensive computation +//! let x = 3 * 4; // expensive computation //! info!("the answer was: {:?}", x); //! } //! } diff --git a/src/liblog/macros.rs b/src/liblog/macros.rs index 5249e971439..5c7085b7b6c 100644 --- a/src/liblog/macros.rs +++ b/src/liblog/macros.rs @@ -119,7 +119,7 @@ macro_rules! warn { /// #[macro_use] extern crate log; /// /// fn main() { -/// let ret = 3i; +/// let ret = 3; /// info!("this function is about to return: {}", ret); /// } /// ``` @@ -145,7 +145,7 @@ macro_rules! info { /// #[macro_use] extern crate log; /// /// fn main() { -/// debug!("x = {x}, y = {y}", x=10i, y=20i); +/// debug!("x = {x}, y = {y}", x=10, y=20); /// } /// ``` /// |