Skip to content

Commit 669bc06

Browse files
committed
Bug 1532645 - Update cubeb-backend to workaround a Rust bug. r=froydnj
rust-lang/rust#58881 doesn't repro with cubeb-backend v5.0.1, so use that so that other Rust nightly users don't get their builds busted. Differential Revision: https://phabricator.services.mozilla.com/D22092 --HG-- extra : moz-landing-system : lando
1 parent 5f9d2ac commit 669bc06

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

Cargo.lock

+6-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"Cargo.toml":"4bae03732c4f490b3c7dbc07d2eabccf5d0f6b5ab2c1c74d592cc7609c9d8d8e","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","src/capi.rs":"300e76bd3901de540b21a2cfc8d15dbcd1b2940d5fbb517fc5fe568af2ec2775","src/lib.rs":"94b80747ae1037423a2281f2572fc6d15cd7702417974ae3730adccd71c7a300","src/log.rs":"af1d787754706e34d6b8f4ac88aa89078ae9a16970b168ad8dc17cc4180688c2","src/ops.rs":"55cbf9bdccdd854834eba72e8bde3e59a9a4193e65209769a1a6e0d8a320b8f6","src/traits.rs":"1a6e3401bb25088d355041704bd89099d62b51eda94da177e7e860646c52b955","tests/test_capi.rs":"9d949cbdb1c19e229ce4f652999a058c283cf7d5a882a669dbca08b71ac2fb62"},"package":"fdcac95519416d9ec814db2dc40e6293e7da25b906023d93f48b87f0587ab138"}
1+
{"files":{"Cargo.toml":"5009330f8a03fc0cf4b10540514496db0281bb92541f9850217c5de7d12dc8b7","LICENSE":"8c044baa5d883274736eeece0b955249076c2697b826e576fce59496235b2cf5","src/capi.rs":"300e76bd3901de540b21a2cfc8d15dbcd1b2940d5fbb517fc5fe568af2ec2775","src/lib.rs":"94b80747ae1037423a2281f2572fc6d15cd7702417974ae3730adccd71c7a300","src/log.rs":"704faeb31934dad6bc6d02e01caa85118754209bd559d30d03fcfa5cb8c1603c","src/ops.rs":"55cbf9bdccdd854834eba72e8bde3e59a9a4193e65209769a1a6e0d8a320b8f6","src/traits.rs":"1a6e3401bb25088d355041704bd89099d62b51eda94da177e7e860646c52b955","tests/test_capi.rs":"9d949cbdb1c19e229ce4f652999a058c283cf7d5a882a669dbca08b71ac2fb62"},"package":"0432a0d08c3f9a778a2b0b6214c87ec2eb17e8639eb68baf0686bdafc4fd11f1"}

third_party/rust/cubeb-backend/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
[package]
1414
name = "cubeb-backend"
15-
version = "0.5.0"
15+
version = "0.5.1"
1616
authors = ["Dan Glastonbury <[email protected]>"]
1717
description = "Bindings to libcubeb internals to facilitate implementing cubeb backends in rust.\n"
1818
homepage = "https://github.com/djg/cubeb-rs"

third_party/rust/cubeb-backend/src/log.rs

+15-13
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,51 @@ macro_rules! cubeb_log_internal {
99
#[allow(unused_unsafe)]
1010
unsafe {
1111
if $level <= $crate::ffi::g_cubeb_log_level.into() {
12-
if let Some(log_callback) = $crate::ffi::g_cubeb_log_callback {
13-
let cstr = ::std::ffi::CString::new(concat!("%s:%d: ", $msg, "\n")).unwrap();
14-
log_callback(cstr.as_ptr(), file!(), line!());
15-
}
12+
cubeb_log_internal!(__INTERNAL__ $msg);
1613
}
1714
}
1815
};
19-
($level: expr, $fmt: expr, $($arg:tt)+) => {
16+
($level: expr, $fmt: expr, $($arg: expr),+) => {
2017
#[allow(unused_unsafe)]
2118
unsafe {
2219
if $level <= $crate::ffi::g_cubeb_log_level.into() {
23-
if let Some(log_callback) = $crate::ffi::g_cubeb_log_callback {
24-
let cstr = ::std::ffi::CString::new(concat!("%s:%d: ", $fmt, "\n")).unwrap();
25-
log_callback(cstr.as_ptr(), file!(), line!(), $($arg)+);
26-
}
20+
cubeb_log_internal!(__INTERNAL__ format!($fmt, $($arg),*));
2721
}
2822
}
23+
};
24+
(__INTERNAL__ $msg: expr) => {
25+
if let Some(log_callback) = $crate::ffi::g_cubeb_log_callback {
26+
let cstr = ::std::ffi::CString::new(format!("{}:{}: {}\n", file!(), line!(), $msg)).unwrap();
27+
log_callback(cstr.as_ptr());
28+
}
2929
}
3030
}
3131

3232
#[macro_export]
3333
macro_rules! cubeb_logv {
3434
($msg: expr) => (cubeb_log_internal!($crate::LogLevel::Verbose, $msg));
35-
($fmt: expr, $($arg: tt)+) => (cubeb_log_internal!($crate::LogLevel::Verbose, $fmt, $($arg)*));
35+
($fmt: expr, $($arg: expr),+) => (cubeb_log_internal!($crate::LogLevel::Verbose, $fmt, $($arg),*));
3636
}
3737

3838
#[macro_export]
3939
macro_rules! cubeb_log {
4040
($msg: expr) => (cubeb_log_internal!($crate::LogLevel::Normal, $msg));
41-
($fmt: expr, $($arg: tt)+) => (cubeb_log_internal!($crate::LogLevel::Normal, $fmt, $($arg)*));
41+
($fmt: expr, $($arg: expr),+) => (cubeb_log_internal!($crate::LogLevel::Normal, $fmt, $($arg),*));
4242
}
4343

4444
#[cfg(test)]
4545
mod tests {
4646
#[test]
4747
fn test_normal_logging() {
4848
cubeb_log!("This is log at normal level");
49-
cubeb_log!("Formatted log %d", 1);
49+
cubeb_log!("{} Formatted log", 1);
50+
cubeb_log!("{} Formatted {} log {}", 1, 2, 3);
5051
}
5152

5253
#[test]
5354
fn test_verbose_logging() {
5455
cubeb_logv!("This is a log at verbose level");
55-
cubeb_logv!("Formatted log %d", 1);
56+
cubeb_logv!("{} Formatted log", 1);
57+
cubeb_logv!("{} Formatted {} log {}", 1, 2, 3);
5658
}
5759
}

0 commit comments

Comments
 (0)