Skip to content

Commit

Permalink
Update to Rust 1.42.0
Browse files Browse the repository at this point in the history
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
  • Loading branch information
David Tolnay authored and facebook-github-bot committed Mar 11, 2020
1 parent 28d0474 commit 1c3ae29
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions shed/ascii_ext/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ impl Deref for AsciiChar {
}

impl From<ascii::AsciiChar> for AsciiChar {
fn from(s: ascii::AsciiChar) -> Self {
AsciiChar(s)
fn from(ch: ascii::AsciiChar) -> Self {
AsciiChar(ch)
}
}

Expand Down
1 change: 0 additions & 1 deletion shed/sql/common/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//! to implement traits to be used with the sql's queries macro.
#![deny(warnings, missing_docs, clippy::all, intra_doc_link_resolution_failure)]
#![feature(wait_until)]

pub mod error;
pub mod mysql;
Expand Down
8 changes: 4 additions & 4 deletions shed/sql/common/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ impl SqliteConnectionGuard {
condvar: Arc<Condvar>,
) -> SqliteConnectionGuard {
let _global_lock =
CONN_CONDVAR.wait_until(CONN_LOCK.lock().expect("lock poisoned"), |allowed| {
CONN_CONDVAR.wait_while(CONN_LOCK.lock().expect("lock poisoned"), |allowed| {
if *allowed {
*allowed = false;
true
} else {
false
} else {
true
}
});
let con = {
let mut mutexguard = condvar
.wait_until(m.lock().expect("poisoned lock"), |con| con.is_some())
.wait_while(m.lock().expect("poisoned lock"), |con| con.is_none())
.expect("poisoned lock");

mutexguard.take().expect("connection should not be empty")
Expand Down
1 change: 0 additions & 1 deletion shed/sql/tests_lib/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

#![deny(warnings, clippy::all)]
#![feature(wait_until)]

use futures::Future;
use sql::mysql_async::prelude::*;
Expand Down

0 comments on commit 1c3ae29

Please sign in to comment.