Skip to content

Commit

Permalink
Move blocking web requests and web sockets entirely to dylibs (#107)
Browse files Browse the repository at this point in the history
Move web sockets and blocking web requests to dylibs, move parser into parser crate
  • Loading branch information
mattwparas authored Dec 5, 2023
1 parent 88612db commit 36f48df
Show file tree
Hide file tree
Showing 34 changed files with 5,346 additions and 6,541 deletions.
106 changes: 75 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ path = "src/main.rs"

[workspace.dependencies]
# This has to line up with the workspace version above
steel-core = { path = "./crates/steel-core", version = "0.5.0", features = ["web", "sqlite", "blocking_requests", "dylibs", "markdown"] }
steel-core = { path = "./crates/steel-core", version = "0.5.0", features = ["web", "sqlite", "dylibs", "markdown"] }

[dependencies]
once_cell = "1.17.0"
Expand Down
14 changes: 5 additions & 9 deletions crates/steel-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@ name = "steel"
[dependencies]
im-rc = "15.1.0"
codespan-reporting = "0.11.1"
# logos = "0.12.1"
log = "0.4.17"

futures-util = "0.3.28"
futures-task = "0.3.28"

serde_json = "1.0.92"
serde = { version = "1.0.152", features = ["derive", "rc"] }
serde_derive = "1.0.152"
serde_json = "1.0.108"
serde = { version = "1.0.193", features = ["derive", "rc"] }
serde_derive = "1.0.193"
bincode = "1.3.3"
pretty = "0.12.1"
im-lists = "0.6.0"
quickscope = "0.2.0"
lasso = { version = "0.6.0", features = ["multi-threaded", "serialize"] }
lasso = { version = "0.7.2", features = ["multi-threaded", "serialize"] }
once_cell = "1.18.0"
fxhash = "0.2.1"
# lazy_static = "1.4.0"
Expand Down Expand Up @@ -63,9 +62,7 @@ cranelift-jit = { version = "0.84.0", optional = true }
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
reqwest = { version = "0.11.14", features = ["blocking", "json"], optional = true }
url = { version = "2.3.1", optional = true }
tungstenite = { version = "0.18.0", features = ["rustls-tls-native-roots"], optional = true }
anyhow = { version = "1", optional = true }
ureq = { version = "2.6.2", features = ["json"], optional = true }

[dev-dependencies]
proptest = "1.1.0"
Expand All @@ -81,12 +78,11 @@ modules = []
jit = ["dep:cranelift", "dep:cranelift-module", "dep:cranelift-jit"]
dynamic = []
profiling = []
web = ["dep:reqwest", "dep:url", "dep:tungstenite"]
web = ["dep:reqwest", "dep:url"]
sqlite = ["dep:rusqlite"]
unsafe-internals = []
anyhow = ["dep:anyhow"]
dylibs = ["dep:abi_stable", "dep:async-ffi"]
blocking_requests = ["dep:ureq"]
markdown = ["dep:termimad"]
smallvec = ["dep:smallvec"]
without-drop-protection = []
Expand Down
Binary file removed crates/steel-core/src/compiled_macros/test.macro
Binary file not shown.
34 changes: 0 additions & 34 deletions crates/steel-core/src/compiled_macros/test.rkt

This file was deleted.

4 changes: 2 additions & 2 deletions crates/steel-core/src/compiler/modules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::{
},
program::PROVIDE,
},
expr_list,
parser::{
ast::{AstTools, Atom, Begin, Define, ExprKind, List, Quote},
expand_visitor::expand_kernel,
Expand All @@ -23,6 +22,8 @@ use crate::{
};
use crate::{parser::expand_visitor::Expander, rvals::Result};

use steel_parser::expr_list;

use std::{
borrow::Cow,
collections::{HashMap, HashSet},
Expand All @@ -37,7 +38,6 @@ use std::time::SystemTime;

use crate::parser::expand_visitor::{expand, extract_macro_defs};

// use itertools::Itertools;
use log::{debug, info, log_enabled};

use crate::parser::ast::IteratorExtensions;
Expand Down
Loading

0 comments on commit 36f48df

Please sign in to comment.