From b8879f3d8cd8401dea369d2ada3c266b2d8c913c Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 30 Jun 2019 15:35:28 +0200
Subject: [PATCH] move shims (foreign items and intrinsics) into submodule

---
 src/lib.rs                                 | 7 +++----
 src/{fn_call.rs => shims/foreign_items.rs} | 0
 src/{intrinsic.rs => shims/intrinsics.rs}  | 0
 src/shims/mod.rs                           | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{fn_call.rs => shims/foreign_items.rs} (100%)
 rename src/{intrinsic.rs => shims/intrinsics.rs} (100%)
 create mode 100644 src/shims/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index 0e4a9c4ccc3..6b2de4ac08b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,9 +12,8 @@ extern crate rustc_data_structures;
 extern crate rustc_mir;
 extern crate rustc_target;
 
-mod fn_call;
+mod shims;
 mod operator;
-mod intrinsic;
 mod helpers;
 mod tls;
 mod range_map;
@@ -29,9 +28,9 @@ pub use rustc_mir::interpret::*;
 // Resolve ambiguity.
 pub use rustc_mir::interpret::{self, AllocMap, PlaceTy};
 
-pub use crate::fn_call::EvalContextExt as MissingFnsEvalContextExt;
+pub use crate::shims::foreign_items::EvalContextExt as ForeignItemsEvalContextExt;
+pub use crate::shims::intrinsics::EvalContextExt as IntrinsicsEvalContextExt;
 pub use crate::operator::EvalContextExt as OperatorEvalContextExt;
-pub use crate::intrinsic::EvalContextExt as IntrinsicEvalContextExt;
 pub use crate::tls::{EvalContextExt as TlsEvalContextExt, TlsData};
 pub use crate::range_map::RangeMap;
 pub use crate::helpers::{EvalContextExt as HelpersEvalContextExt};
diff --git a/src/fn_call.rs b/src/shims/foreign_items.rs
similarity index 100%
rename from src/fn_call.rs
rename to src/shims/foreign_items.rs
diff --git a/src/intrinsic.rs b/src/shims/intrinsics.rs
similarity index 100%
rename from src/intrinsic.rs
rename to src/shims/intrinsics.rs
diff --git a/src/shims/mod.rs b/src/shims/mod.rs
new file mode 100644
index 00000000000..cadfc05681d
--- /dev/null
+++ b/src/shims/mod.rs
@@ -0,0 +1,2 @@
+pub mod foreign_items;
+pub mod intrinsics;