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

marco-c · marco-c · commit 46f2fc258eeb · 2019-10-04T04:35:55.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
@@ -42,81 +42,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
@@ -128,7 +63,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -160,6 +95,34 @@ into
 (
 )
 {
+cubeb_log_internal
+!
+(
+__INTERNAL__
+format
+!
+(
+fmt
+(
+arg
+)
+*
+)
+)
+;
+}
+}
+}
+;
+(
+__INTERNAL__
+msg
+:
+expr
+)
+=
+>
+{
 if
 let
 Some
@@ -191,22 +154,30 @@ CString
 :
 new
 (
-concat
+format
 !
 (
 "
-%
-s
+{
+}
 :
-%
-d
+{
+}
 :
-"
-fmt
-"
+{
+}
 \
 n
 "
+file
+!
+(
+)
+line
+!
+(
+)
+msg
 )
 )
 .
@@ -221,25 +192,11 @@ cstr
 as_ptr
 (
 )
-file
-!
-(
-)
-line
-!
-(
-)
-(
-arg
-)
-+
 )
 ;
 }
 }
 }
-}
-}
 #
 [
 macro_export
@@ -277,7 +234,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -340,7 +297,7 @@ expr
 (
 arg
 :
-tt
+expr
 )
 +
 )
@@ -402,14 +359,32 @@ cubeb_log
 !
 (
 "
+{
+}
 Formatted
 log
-%
-d
 "
 1
 )
 ;
+cubeb_log
+!
+(
+"
+{
+}
+Formatted
+{
+}
+log
+{
+}
+"
+1
+2
+3
+)
+;
 }
 #
 [
@@ -438,13 +413,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
`@@ -42,81 +42,16 @@ into`
`42`	`42`	`(`
`43`	`43`	`)`
`44`	`44`	`{`
`45`		`-if`
`46`		`-let`
`47`		`-Some`
`48`		`-(`
`49`		`-log_callback`
`50`		`-)`
`51`		`-=`
`52`		`-crate`
`53`		`-:`
`54`		`-:`
`55`		`-ffi`
`56`		`-:`
`57`		`-:`
`58`		`-g_cubeb_log_callback`
`59`		`-{`
`60`		`-let`
`61`		`-cstr`
`62`		`-=`
`63`		`-:`
`64`		`-:`
`65`		`-std`
`66`		`-:`
`67`		`-:`
`68`		`-ffi`
`69`		`-:`
`70`		`-:`
`71`		`-CString`
`72`		`-:`
`73`		`-:`
`74`		`-new`
`75`		`-(`
`76`		`-concat`
	`45`	`+cubeb_log_internal`
`77`	`46`	`!`
`78`	`47`	`(`
`79`		`-"`
`80`		`-%`
`81`		`-s`
`82`		`-:`
`83`		`-%`
`84`		`-d`
`85`		`-:`
`86`		`-"`
	`48`	`+__INTERNAL__`
`87`	`49`	`msg`
`88`		`-"`
`89`		`-\`
`90`		`-n`
`91`		`-"`
`92`		`-)`
`93`		`-)`
`94`		`-.`
`95`		`-unwrap`
`96`		`-(`
`97`		`-)`
`98`		`-;`
`99`		`-log_callback`
`100`		`-(`
`101`		`-cstr`
`102`		`-.`
`103`		`-as_ptr`
`104`		`-(`
`105`		`-)`
`106`		`-file`
`107`		`-!`
`108`		`-(`
`109`		`-)`
`110`		`-line`
`111`		`-!`
`112`		`-(`
`113`		`-)`
`114`	`50`	`)`
`115`	`51`	`;`
`116`	`52`	`}`
`117`	`53`	`}`
`118`	`54`	`}`
`119`		`-}`
`120`	`55`	`;`
`121`	`56`	`(`
`122`	`57`	`level`
`@@ -128,7 +63,7 @@ expr`
`128`	`63`	`(`
`129`	`64`	`arg`
`130`	`65`	`:`
`131`		`-tt`
	`66`	`+expr`
`132`	`67`	`)`
`133`	`68`	`+`
`134`	`69`	`)`
`@@ -160,6 +95,34 @@ into`
`160`	`95`	`(`
`161`	`96`	`)`
`162`	`97`	`{`
	`98`	`+cubeb_log_internal`
	`99`	`+!`
	`100`	`+(`
	`101`	`+__INTERNAL__`
	`102`	`+format`
	`103`	`+!`
	`104`	`+(`
	`105`	`+fmt`
	`106`	`+(`
	`107`	`+arg`
	`108`	`+)`
	`109`	`+*`
	`110`	`+)`
	`111`	`+)`
	`112`	`+;`
	`113`	`+}`
	`114`	`+}`
	`115`	`+}`
	`116`	`+;`
	`117`	`+(`
	`118`	`+__INTERNAL__`
	`119`	`+msg`
	`120`	`+:`
	`121`	`+expr`
	`122`	`+)`
	`123`	`+=`
	`124`	`+>`
	`125`	`+{`
`163`	`126`	`if`
`164`	`127`	`let`
`165`	`128`	`Some`
`@@ -191,22 +154,30 @@ CString`
`191`	`154`	`:`
`192`	`155`	`new`
`193`	`156`	`(`
`194`		`-concat`
	`157`	`+format`
`195`	`158`	`!`
`196`	`159`	`(`
`197`	`160`	`"`
`198`		`-%`
`199`		`-s`
	`161`	`+{`
	`162`	`+}`
`200`	`163`	`:`
`201`		`-%`
`202`		`-d`
	`164`	`+{`
	`165`	`+}`
`203`	`166`	`:`
`204`		`-"`
`205`		`-fmt`
`206`		`-"`
	`167`	`+{`
	`168`	`+}`
`207`	`169`	`\`
`208`	`170`	`n`
`209`	`171`	`"`
	`172`	`+file`
	`173`	`+!`
	`174`	`+(`
	`175`	`+)`
	`176`	`+line`
	`177`	`+!`
	`178`	`+(`
	`179`	`+)`
	`180`	`+msg`
`210`	`181`	`)`
`211`	`182`	`)`
`212`	`183`	`.`
`@@ -221,25 +192,11 @@ cstr`
`221`	`192`	`as_ptr`
`222`	`193`	`(`
`223`	`194`	`)`
`224`		`-file`
`225`		`-!`
`226`		`-(`
`227`		`-)`
`228`		`-line`
`229`		`-!`
`230`		`-(`
`231`		`-)`
`232`		`-(`
`233`		`-arg`
`234`		`-)`
`235`		`-+`
`236`	`195`	`)`
`237`	`196`	`;`
`238`	`197`	`}`
`239`	`198`	`}`
`240`	`199`	`}`
`241`		`-}`
`242`		`-}`
`243`	`200`	`#`
`244`	`201`	`[`
`245`	`202`	`macro_export`
`@@ -277,7 +234,7 @@ expr`
`277`	`234`	`(`
`278`	`235`	`arg`
`279`	`236`	`:`
`280`		`-tt`
	`237`	`+expr`
`281`	`238`	`)`
`282`	`239`	`+`
`283`	`240`	`)`
`@@ -340,7 +297,7 @@ expr`
`340`	`297`	`(`
`341`	`298`	`arg`
`342`	`299`	`:`
`343`		`-tt`
	`300`	`+expr`
`344`	`301`	`)`
`345`	`302`	`+`
`346`	`303`	`)`
`@@ -402,14 +359,32 @@ cubeb_log`
`402`	`359`	`!`
`403`	`360`	`(`
`404`	`361`	`"`
	`362`	`+{`
	`363`	`+}`
`405`	`364`	`Formatted`
`406`	`365`	`log`
`407`		`-%`
`408`		`-d`
`409`	`366`	`"`
`410`	`367`	`1`
`411`	`368`	`)`
`412`	`369`	`;`
	`370`	`+cubeb_log`
	`371`	`+!`
	`372`	`+(`
	`373`	`+"`
	`374`	`+{`
	`375`	`+}`
	`376`	`+Formatted`
	`377`	`+{`
	`378`	`+}`
	`379`	`+log`
	`380`	`+{`
	`381`	`+}`
	`382`	`+"`
	`383`	`+1`
	`384`	`+2`
	`385`	`+3`
	`386`	`+)`
	`387`	`+;`
`413`	`388`	`}`
`414`	`389`	`#`
`415`	`390`	`[`
`@@ -438,13 +413,31 @@ cubeb_logv`
`438`	`413`	`!`
`439`	`414`	`(`
`440`	`415`	`"`
	`416`	`+{`
	`417`	`+}`
`441`	`418`	`Formatted`
`442`	`419`	`log`
`443`		`-%`
`444`		`-d`
`445`	`420`	`"`
`446`	`421`	`1`
`447`	`422`	`)`
`448`	`423`	`;`
	`424`	`+cubeb_logv`
	`425`	`+!`
	`426`	`+(`
	`427`	`+"`
	`428`	`+{`
	`429`	`+}`
	`430`	`+Formatted`
	`431`	`+{`
	`432`	`+}`
	`433`	`+log`
	`434`	`+{`
	`435`	`+}`
	`436`	`+"`
	`437`	`+1`
	`438`	`+2`
	`439`	`+3`
	`440`	`+)`
	`441`	`+;`
`449`	`442`	`}`
`450`	`443`	`}`