diff options
| author | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-07-13 15:54:12 +0200 |
|---|---|---|
| committer | Aleksey Kladov <aleksey.kladov@gmail.com> | 2020-07-13 16:21:02 +0200 |
| commit | 6b4cf5b7d8043469c9856f6578d282f9532d7fe0 (patch) | |
| tree | 1d3797b52b7a5ebbbb0b58f402d6e899f2337ba1 | |
| parent | 4b1c3724364ff538acdcb44bdd23d501ef54cff3 (diff) | |
| download | rust-6b4cf5b7d8043469c9856f6578d282f9532d7fe0.tar.gz rust-6b4cf5b7d8043469c9856f6578d282f9532d7fe0.zip | |
Move stdx macros into submodule
| -rw-r--r-- | crates/stdx/src/lib.rs | 21 | ||||
| -rw-r--r-- | crates/stdx/src/macros.rs | 19 |
2 files changed, 21 insertions, 19 deletions
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs index 3b605c79dd6..988853ed2a4 100644 --- a/crates/stdx/src/lib.rs +++ b/crates/stdx/src/lib.rs @@ -1,30 +1,13 @@ //! Missing batteries for standard libraries. use std::{cell::Cell, fmt, time::Instant}; +mod macros; + #[inline(always)] pub fn is_ci() -> bool { option_env!("CI").is_some() } -#[macro_export] -macro_rules! eprintln { - ($($tt:tt)*) => {{ - if $crate::is_ci() { - panic!("Forgot to remove debug-print?") - } - std::eprintln!($($tt)*) - }} -} - -/// Appends formatted string to a `String`. -#[macro_export] -macro_rules! format_to { - ($buf:expr) => (); - ($buf:expr, $lit:literal $($arg:tt)*) => { - { use ::std::fmt::Write as _; let _ = ::std::write!($buf, $lit $($arg)*); } - }; -} - pub trait SepBy: Sized { /// Returns an `impl fmt::Display`, which joins elements via a separator. fn sep_by<'a>(self, sep: &'a str) -> SepByBuilder<'a, Self>; diff --git a/crates/stdx/src/macros.rs b/crates/stdx/src/macros.rs new file mode 100644 index 00000000000..0f7690a6760 --- /dev/null +++ b/crates/stdx/src/macros.rs @@ -0,0 +1,19 @@ +//! Convenience macros. +#[macro_export] +macro_rules! eprintln { + ($($tt:tt)*) => {{ + if $crate::is_ci() { + panic!("Forgot to remove debug-print?") + } + std::eprintln!($($tt)*) + }} +} + +/// Appends formatted string to a `String`. +#[macro_export] +macro_rules! format_to { + ($buf:expr) => (); + ($buf:expr, $lit:literal $($arg:tt)*) => { + { use ::std::fmt::Write as _; let _ = ::std::write!($buf, $lit $($arg)*); } + }; +} |
