UB if f*_fast intrinsic called with nonfinite value

[rust.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 77eac9a6324a4c440b7af866ad52e33d9e7d30e4..6a5e7af23726903d8e50da6a69258dba7d97beb5 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,17 +1,12 @@
 #![feature(rustc_private)]
-#![feature(option_expect_none, option_unwrap_none)]
 #![feature(map_first_last)]
+#![feature(map_try_insert)]
 #![feature(never_type)]
-#![feature(or_patterns)]
 #![feature(try_blocks)]
 
 #![warn(rust_2018_idioms)]
 #![allow(clippy::cast_lossless)]
 
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-extern crate rustc_attr;
 extern crate rustc_apfloat;
 extern crate rustc_ast;
 #[macro_use] extern crate rustc_middle;
@@ -22,6 +17,7 @@
 extern crate rustc_span;
 extern crate rustc_target;
 
+mod data_race;
 mod diagnostics;
 mod eval;
 mod helpers;
@@ -34,6 +30,7 @@
 mod stacked_borrows;
 mod sync;
 mod thread;
+mod vector_clock;
 
 // Establish a "crate-wide prelude": we often import `crate::*`.
 
@@ -52,6 +49,10 @@
 pub use crate::shims::tls::{EvalContextExt as _, TlsData};
 pub use crate::shims::EvalContextExt as _;
 
+pub use crate::data_race::{
+    AtomicReadOp, AtomicWriteOp, AtomicRwOp, AtomicFenceOp,
+    EvalContextExt as DataRaceEvalContextExt
+};
 pub use crate::diagnostics::{
     register_diagnostic, report_error, EvalContextExt as DiagnosticsEvalContextExt,
     TerminationInfo, NonHaltingDiagnostic,
@@ -74,15 +75,16 @@
 pub use crate::sync::{
     EvalContextExt as SyncEvalContextExt, CondvarId, MutexId, RwLockId
 };
+pub use crate::vector_clock::{
+    VClock, VectorIdx, VTimestamp
+};
 
 /// Insert rustc arguments at the beginning of the argument list that Miri wants to be
 /// set per default, for maximal validation power.
-pub fn miri_default_args() -> &'static [&'static str] {
-    &[
-        "-Zalways-encode-mir",
-        "-Zmir-emit-retag",
-        "-Zmir-opt-level=0",
-        "--cfg=miri",
-        "-Cdebug-assertions=on",
-    ]
-}
+pub const MIRI_DEFAULT_ARGS: &[&str] = &[
+    "-Zalways-encode-mir",
+    "-Zmir-emit-retag",
+    "-Zmir-opt-level=0",
+    "--cfg=miri",
+    "-Cdebug-assertions=on",
+];