Skip to content

Commit 1f9bd38

Browse files
committed
Added module change so we can merge this
1 parent 4335020 commit 1f9bd38

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/environment.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ impl Environment {
7171
pub fn clojure_core_environment() -> Rc<Environment> {
7272
// Register our macros / functions ahead of time
7373
let add_fn = rust_core::AddFn {};
74-
let subtract_fn = rust_core::_subtract_::SubtractFn {};
75-
let multiply_fn = rust_core::_multiply_::MultiplyFn {};
76-
let divide_fn = rust_core::_divide_::DivideFn {};
74+
let subtract_fn = rust_core::SubtractFn {};
75+
let multiply_fn = rust_core::MultiplyFn {};
76+
let divide_fn = rust_core::DivideFn {};
7777
let str_fn = rust_core::StrFn {};
7878
let do_fn = rust_core::DoFn {};
7979
let nth_fn = rust_core::NthFn {};

src/rust_core.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ use crate::error_message;
2020
use crate::util::IsEven;
2121

2222
pub(crate) mod _subtract_;
23+
pub use self::_subtract_::*;
24+
2325
pub(crate) mod _divide_;
24-
pub(crate) mod _multiply_;
26+
pub use self::_divide_::*;
2527

28+
pub(crate) mod _multiply_;
29+
pub use self::_multiply_::*;
30+
//
2631
// This module will hold core function and macro primitives that aren't special cases
2732
// (like the quote macro, or let), and can't be implemented in clojure itself
28-
33+
//
2934
#[derive(Debug, Clone)]
3035
pub struct StrFn {}
3136
impl ToValue for StrFn {

0 commit comments

Comments
 (0)