Bug 1532645 - Update cubeb-backend to workaround a Rust bug. r=froydnj

marco-c · marco-c · commit f5e6d142b22d · 2019-10-04T01:14:31.000Z
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 UltraBlame original commit: 9286348b9c33218e956417ce8675851ddbccaeaa
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/third_party/rust/cubeb-backend/.cargo-checksum.json b/third_party/rust/cubeb-backend/.cargo-checksum.json
@@ -11,7 +11,7 @@ toml
 "
 :
 "
-4bae03732c4f490b3c7dbc07d2eabccf5d0f6b5ab2c1c74d592cc7609c9d8d8e
+5009330f8a03fc0cf4b10540514496db0281bb92541f9850217c5de7d12dc8b7
 "
 "
 LICENSE
@@ -51,7 +51,7 @@ rs
 "
 :
 "
-af1d787754706e34d6b8f4ac88aa89078ae9a16970b168ad8dc17cc4180688c2
+704faeb31934dad6bc6d02e01caa85118754209bd559d30d03fcfa5cb8c1603c
 "
 "
 src
@@ -92,6 +92,6 @@ package
 "
 :
 "
-fdcac95519416d9ec814db2dc40e6293e7da25b906023d93f48b87f0587ab138
+0432a0d08c3f9a778a2b0b6214c87ec2eb17e8639eb68baf0686bdafc4fd11f1
 "
 }
diff --git a/third_party/rust/cubeb-backend/Cargo.toml b/third_party/rust/cubeb-backend/Cargo.toml
@@ -124,7 +124,7 @@ version
 .
 5
 .
-0
+1
 "
 authors
 =
diff --git a/third_party/rust/cubeb-backend/src/log.rs b/third_party/rust/cubeb-backend/src/log.rs
@@ -76,81 +76,16 @@ into
 (
 )
 {
-if
-let
-Some
-(
-log_callback
-)
-=
-crate
-:
-:
-ffi
-:
-:
-g_cubeb_log_callback
-{
-let
-cstr
-=
-:
-:
-std
-:
-:
-ffi
-:
-:
-CString
-:
-:
-new
-(
-concat
+cubeb_log_internal
 !
 (
-"
-%
-s
-:
-%
-d
-:
-"
+__INTERNAL__
 msg
-"
-\
-n
-"
-)
-)
-.
-unwrap
-(
-)
-;
-log_callback
-(
-cstr
-.
-as_ptr
-(
-)
-file
-!
-(
-)
-line
-!
-(
-)
 )
 ;
 }
 }
 }
-}
 ;
 (
 level
@@ -162,7 +97,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -194,6 +129,34 @@ into
 (
 )
 {
+cubeb_log_internal
+!
+(
+__INTERNAL__
+format
+!
+(
+fmt
+(
+arg
+)
+*
+)
+)
+;
+}
+}
+}
+;
+(
+__INTERNAL__
+msg
+:
+expr
+)
+=
+>
+{
 if
 let
 Some
@@ -225,22 +188,30 @@ CString
 :
 new
 (
-concat
+format
 !
 (
 "
-%
-s
+{
+}
 :
-%
-d
+{
+}
 :
-"
-fmt
-"
+{
+}
 \
 n
 "
+file
+!
+(
+)
+line
+!
+(
+)
+msg
 )
 )
 .
@@ -255,25 +226,11 @@ cstr
 as_ptr
 (
 )
-file
-!
-(
-)
-line
-!
-(
-)
-(
-arg
-)
-+
 )
 ;
 }
 }
 }
-}
-}
 #
 [
 macro_export
@@ -311,7 +268,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -374,7 +331,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -436,14 +393,32 @@ cubeb_log
 !
 (
 "
+{
+}
 Formatted
 log
-%
-d
 "
 1
 )
 ;
+cubeb_log
+!
+(
+"
+{
+}
+Formatted
+{
+}
+log
+{
+}
+"
+1
+2
+3
+)
+;
 }
 #
 [
@@ -472,13 +447,31 @@ cubeb_logv
 !
 (
 "
+{
+}
 Formatted
 log
-%
-d
 "
 1
 )
 ;
+cubeb_logv
+!
+(
+"
+{
+}
+Formatted
+{
+}
+log
+{
+}
+"
+1
+2
+3
+)
+;
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ toml`
`11`	`11`	`"`
`12`	`12`	`:`
`13`	`13`	`"`
`14`		`-4bae03732c4f490b3c7dbc07d2eabccf5d0f6b5ab2c1c74d592cc7609c9d8d8e`
	`14`	`+5009330f8a03fc0cf4b10540514496db0281bb92541f9850217c5de7d12dc8b7`
`15`	`15`	`"`
`16`	`16`	`"`
`17`	`17`	`LICENSE`
`@@ -51,7 +51,7 @@ rs`
`51`	`51`	`"`
`52`	`52`	`:`
`53`	`53`	`"`
`54`		`-af1d787754706e34d6b8f4ac88aa89078ae9a16970b168ad8dc17cc4180688c2`
	`54`	`+704faeb31934dad6bc6d02e01caa85118754209bd559d30d03fcfa5cb8c1603c`
`55`	`55`	`"`
`56`	`56`	`"`
`57`	`57`	`src`
`@@ -92,6 +92,6 @@ package`
`92`	`92`	`"`
`93`	`93`	`:`
`94`	`94`	`"`
`95`		`-fdcac95519416d9ec814db2dc40e6293e7da25b906023d93f48b87f0587ab138`
	`95`	`+0432a0d08c3f9a778a2b0b6214c87ec2eb17e8639eb68baf0686bdafc4fd11f1`
`96`	`96`	`"`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ version`
`124`	`124`	`.`
`125`	`125`	`5`
`126`	`126`	`.`
`127`		`-0`
	`127`	`+1`
`128`	`128`	`"`
`129`	`129`	`authors`
`130`	`130`	`=`
Original file line number	Diff line number	Diff line change
`@@ -76,81 +76,16 @@ into`
`76`	`76`	`(`
`77`	`77`	`)`
`78`	`78`	`{`
`79`		`-if`
`80`		`-let`
`81`		`-Some`
`82`		`-(`
`83`		`-log_callback`
`84`		`-)`
`85`		`-=`
`86`		`-crate`
`87`		`-:`
`88`		`-:`
`89`		`-ffi`
`90`		`-:`
`91`		`-:`
`92`		`-g_cubeb_log_callback`
`93`		`-{`
`94`		`-let`
`95`		`-cstr`
`96`		`-=`
`97`		`-:`
`98`		`-:`
`99`		`-std`
`100`		`-:`
`101`		`-:`
`102`		`-ffi`
`103`		`-:`
`104`		`-:`
`105`		`-CString`
`106`		`-:`
`107`		`-:`
`108`		`-new`
`109`		`-(`
`110`		`-concat`
	`79`	`+cubeb_log_internal`
`111`	`80`	`!`
`112`	`81`	`(`
`113`		`-"`
`114`		`-%`
`115`		`-s`
`116`		`-:`
`117`		`-%`
`118`		`-d`
`119`		`-:`
`120`		`-"`
	`82`	`+__INTERNAL__`
`121`	`83`	`msg`
`122`		`-"`
`123`		`-\`
`124`		`-n`
`125`		`-"`
`126`		`-)`
`127`		`-)`
`128`		`-.`
`129`		`-unwrap`
`130`		`-(`
`131`		`-)`
`132`		`-;`
`133`		`-log_callback`
`134`		`-(`
`135`		`-cstr`
`136`		`-.`
`137`		`-as_ptr`
`138`		`-(`
`139`		`-)`
`140`		`-file`
`141`		`-!`
`142`		`-(`
`143`		`-)`
`144`		`-line`
`145`		`-!`
`146`		`-(`
`147`		`-)`
`148`	`84`	`)`
`149`	`85`	`;`
`150`	`86`	`}`
`151`	`87`	`}`
`152`	`88`	`}`
`153`		`-}`
`154`	`89`	`;`
`155`	`90`	`(`
`156`	`91`	`level`
`@@ -162,7 +97,7 @@ expr`
`162`	`97`	`(`
`163`	`98`	`arg`
`164`	`99`	`:`
`165`		`-tt`
	`100`	`+expr`
`166`	`101`	`)`
`167`	`102`	`+`
`168`	`103`	`)`
`@@ -194,6 +129,34 @@ into`
`194`	`129`	`(`
`195`	`130`	`)`
`196`	`131`	`{`
	`132`	`+cubeb_log_internal`
	`133`	`+!`
	`134`	`+(`
	`135`	`+__INTERNAL__`
	`136`	`+format`
	`137`	`+!`
	`138`	`+(`
	`139`	`+fmt`
	`140`	`+(`
	`141`	`+arg`
	`142`	`+)`
	`143`	`+*`
	`144`	`+)`
	`145`	`+)`
	`146`	`+;`
	`147`	`+}`
	`148`	`+}`
	`149`	`+}`
	`150`	`+;`
	`151`	`+(`
	`152`	`+__INTERNAL__`
	`153`	`+msg`
	`154`	`+:`
	`155`	`+expr`
	`156`	`+)`
	`157`	`+=`
	`158`	`+>`
	`159`	`+{`
`197`	`160`	`if`
`198`	`161`	`let`
`199`	`162`	`Some`
`@@ -225,22 +188,30 @@ CString`
`225`	`188`	`:`
`226`	`189`	`new`
`227`	`190`	`(`
`228`		`-concat`
	`191`	`+format`
`229`	`192`	`!`
`230`	`193`	`(`
`231`	`194`	`"`
`232`		`-%`
`233`		`-s`
	`195`	`+{`
	`196`	`+}`
`234`	`197`	`:`
`235`		`-%`
`236`		`-d`
	`198`	`+{`
	`199`	`+}`
`237`	`200`	`:`
`238`		`-"`
`239`		`-fmt`
`240`		`-"`
	`201`	`+{`
	`202`	`+}`
`241`	`203`	`\`
`242`	`204`	`n`
`243`	`205`	`"`
	`206`	`+file`
	`207`	`+!`
	`208`	`+(`
	`209`	`+)`
	`210`	`+line`
	`211`	`+!`
	`212`	`+(`
	`213`	`+)`
	`214`	`+msg`
`244`	`215`	`)`
`245`	`216`	`)`
`246`	`217`	`.`
`@@ -255,25 +226,11 @@ cstr`
`255`	`226`	`as_ptr`
`256`	`227`	`(`
`257`	`228`	`)`
`258`		`-file`
`259`		`-!`
`260`		`-(`
`261`		`-)`
`262`		`-line`
`263`		`-!`
`264`		`-(`
`265`		`-)`
`266`		`-(`
`267`		`-arg`
`268`		`-)`
`269`		`-+`
`270`	`229`	`)`
`271`	`230`	`;`
`272`	`231`	`}`
`273`	`232`	`}`
`274`	`233`	`}`
`275`		`-}`
`276`		`-}`
`277`	`234`	`#`
`278`	`235`	`[`
`279`	`236`	`macro_export`
`@@ -311,7 +268,7 @@ expr`
`311`	`268`	`(`
`312`	`269`	`arg`
`313`	`270`	`:`
`314`		`-tt`
	`271`	`+expr`
`315`	`272`	`)`
`316`	`273`	`+`
`317`	`274`	`)`
`@@ -374,7 +331,7 @@ expr`
`374`	`331`	`(`
`375`	`332`	`arg`
`376`	`333`	`:`
`377`		`-tt`
	`334`	`+expr`
`378`	`335`	`)`
`379`	`336`	`+`
`380`	`337`	`)`
`@@ -436,14 +393,32 @@ cubeb_log`
`436`	`393`	`!`
`437`	`394`	`(`
`438`	`395`	`"`
	`396`	`+{`
	`397`	`+}`
`439`	`398`	`Formatted`
`440`	`399`	`log`
`441`		`-%`
`442`		`-d`
`443`	`400`	`"`
`444`	`401`	`1`
`445`	`402`	`)`
`446`	`403`	`;`
	`404`	`+cubeb_log`
	`405`	`+!`
	`406`	`+(`
	`407`	`+"`
	`408`	`+{`
	`409`	`+}`
	`410`	`+Formatted`
	`411`	`+{`
	`412`	`+}`
	`413`	`+log`
	`414`	`+{`
	`415`	`+}`
	`416`	`+"`
	`417`	`+1`
	`418`	`+2`
	`419`	`+3`
	`420`	`+)`
	`421`	`+;`
`447`	`422`	`}`
`448`	`423`	`#`
`449`	`424`	`[`
`@@ -472,13 +447,31 @@ cubeb_logv`
`472`	`447`	`!`
`473`	`448`	`(`
`474`	`449`	`"`
	`450`	`+{`
	`451`	`+}`
`475`	`452`	`Formatted`
`476`	`453`	`log`
`477`		`-%`
`478`		`-d`
`479`	`454`	`"`
`480`	`455`	`1`
`481`	`456`	`)`
`482`	`457`	`;`
	`458`	`+cubeb_logv`
	`459`	`+!`
	`460`	`+(`
	`461`	`+"`
	`462`	`+{`
	`463`	`+}`
	`464`	`+Formatted`
	`465`	`+{`
	`466`	`+}`
	`467`	`+log`
	`468`	`+{`
	`469`	`+}`
	`470`	`+"`
	`471`	`+1`
	`472`	`+2`
	`473`	`+3`
	`474`	`+)`
	`475`	`+;`
`483`	`476`	`}`
`484`	`477`	`}`