Skip to content

Commit 17275f8

Browse files
author
bors-servo
authored
Auto merge of #561 - pornel:logging, r=fitzgen
Run without logging feature The build was broken without default features
2 parents 1a4b8e6 + 620a069 commit 17275f8

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/log_stubs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
macro_rules! log {
2-
(target: $target:expr, $lvl:expr, $($arg)+) => {
2+
(target: $target:expr, $lvl:expr, $($arg:tt)+) => {
33
let _ = $target;
44
let _ = log!($lvl, $($arg)+);
55
};
6-
($lvl:expr, $($arg:tt)+) => {
6+
($lvl:expr, $($arg:tt)+) => {{
77
let _ = $lvl;
88
let _ = format_args!($($arg)+);
9-
};
9+
}};
1010
}
1111
macro_rules! error {
1212
(target: $target:expr, $($arg:tt)*) => { log!($target, $($arg)*); };

src/main.rs

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
extern crate bindgen;
2+
#[cfg(feature="logging")]
23
extern crate env_logger;
34
#[macro_use]
5+
#[cfg(feature="logging")]
46
extern crate log;
57
extern crate clang_sys;
68
extern crate clap;
@@ -10,10 +12,15 @@ use bindgen::clang_version;
1012
use std::env;
1113
use std::panic;
1214

15+
#[macro_use]
16+
#[cfg(not(feature="logging"))]
17+
mod log_stubs;
18+
1319
mod options;
1420
use options::builder_from_flags;
1521

1622
pub fn main() {
23+
#[cfg(feature="logging")]
1724
log::set_logger(|max_log_level| {
1825
use env_logger::Logger;
1926
let env_logger = Logger::new();

0 commit comments

Comments
 (0)