Skip to content

Commit 1c3ae29

Browse files
David Tolnayfacebook-github-bot
authored andcommitted
Update to Rust 1.42.0
Summary: This diff upgrades fbcode platform007 and platform009 to rust 1.42.0 + a cherry-pick of rust-lang/rust#69685 for AddressSanitizer support, and xplat to plain 1.42.0. Be aware that the xplat toolchain, for which we use the official upstream releases and don't build from source, no longer supports armv7-apple-ios and armv7s-apple-ios targets as of 1.42.0. Differential Revision: D20379253 fbshipit-source-id: c98fecc35dbe077f8dd1b8c7a7bab098795ac2dd
1 parent 28d0474 commit 1c3ae29

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

shed/ascii_ext/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ impl Deref for AsciiChar {
8585
}
8686

8787
impl From<ascii::AsciiChar> for AsciiChar {
88-
fn from(s: ascii::AsciiChar) -> Self {
89-
AsciiChar(s)
88+
fn from(ch: ascii::AsciiChar) -> Self {
89+
AsciiChar(ch)
9090
}
9191
}
9292

shed/sql/common/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//! to implement traits to be used with the sql's queries macro.
1111
1212
#![deny(warnings, missing_docs, clippy::all, intra_doc_link_resolution_failure)]
13-
#![feature(wait_until)]
1413

1514
pub mod error;
1615
pub mod mysql;

shed/sql/common/sqlite.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ impl SqliteConnectionGuard {
5353
condvar: Arc<Condvar>,
5454
) -> SqliteConnectionGuard {
5555
let _global_lock =
56-
CONN_CONDVAR.wait_until(CONN_LOCK.lock().expect("lock poisoned"), |allowed| {
56+
CONN_CONDVAR.wait_while(CONN_LOCK.lock().expect("lock poisoned"), |allowed| {
5757
if *allowed {
5858
*allowed = false;
59-
true
60-
} else {
6159
false
60+
} else {
61+
true
6262
}
6363
});
6464
let con = {
6565
let mut mutexguard = condvar
66-
.wait_until(m.lock().expect("poisoned lock"), |con| con.is_some())
66+
.wait_while(m.lock().expect("poisoned lock"), |con| con.is_none())
6767
.expect("poisoned lock");
6868

6969
mutexguard.take().expect("connection should not be empty")

shed/sql/tests_lib/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
#![deny(warnings, clippy::all)]
10-
#![feature(wait_until)]
1110

1211
use futures::Future;
1312
use sql::mysql_async::prelude::*;

0 commit comments

Comments
 (0)