Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions dfir_rs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,25 @@ pub mod compiled;
pub mod scheduled;
pub mod util;

pub use bincode;
pub use bytes;
#[cfg(feature = "meta")]
#[cfg_attr(docsrs, doc(cfg(feature = "meta")))]
pub use dfir_lang as lang;
pub use futures;
pub use itertools;
pub use lattices;
pub use pin_project_lite;
pub use rustc_hash;
pub use serde;
pub use serde_json;
pub use sinktools;
pub use tokio;
pub use tokio_stream;
pub use tokio_util;
pub use tracing;
pub use variadics::{self, var_args, var_expr, var_type};
pub use {
bincode, bytes, futures, itertools, lattices, pin_project_lite, rustc_hash, serde, serde_json,
sinktools, tokio, tokio_stream, tokio_util, tracing, web_time,
};
pub use web_time;

/// `#[macro_use]` automagically brings the declarative macro export to the crate-level.
mod declarative_macro;
Expand Down
3 changes: 2 additions & 1 deletion hydro_build_utils/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub use {insta, rustc_version};
pub use insta;
pub use rustc_version;

#[macro_export]
macro_rules! emit_nightly_configuration {
Expand Down
6 changes: 5 additions & 1 deletion hydro_lang/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ stageleft::stageleft_no_entry_crate!();
#[cfg_attr(docsrs, doc(cfg(feature = "runtime_support")))]
#[doc(hidden)]
pub mod runtime_support {
pub use bincode;
#[cfg(feature = "sim")]
pub use colored;
pub use dfir_rs;
#[cfg(feature = "deploy_integration")]
pub use hydro_deploy_integration;
pub use {bincode, dfir_rs, slotmap, stageleft, tokio};
pub use slotmap;
pub use stageleft;
pub use tokio;

#[cfg(any(feature = "deploy_integration", feature = "docker_runtime"))]
pub mod launch;
Expand Down
2 changes: 1 addition & 1 deletion hydro_lang/src/live_collections/keyed_singleton.rs
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ impl<'a, K, V, L: Location<'a>, B: KeyedSingletonBound> KeyedSingleton<K, V, L,
/// # }));
/// # }
/// ```
pub fn get(self, key: Singleton<K, L, Bounded>) -> Optional<V, L, Bounded>
pub fn get(self, key: impl Into<Optional<K, L, Bounded>>) -> Optional<V, L, Bounded>
where
B: IsBounded,
K: Hash + Eq,
Expand Down
5 changes: 2 additions & 3 deletions hydro_lang/src/live_collections/keyed_stream/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use stageleft::{IntoQuotedMut, QuotedWithContext, QuotedWithContextWithProps, q}
use super::boundedness::{Bounded, Boundedness, IsBounded, Unbounded};
use super::keyed_singleton::KeyedSingleton;
use super::optional::Optional;
use super::singleton::Singleton;
use super::stream::{
ExactlyOnce, IsExactlyOnce, IsOrdered, MinOrder, MinRetries, NoOrder, Stream, TotalOrder,
};
Expand Down Expand Up @@ -2128,14 +2127,14 @@ impl<'a, K, V, L: Location<'a>, B: Boundedness, O: Ordering, R: Retries>
/// # }));
/// # }
/// ```
pub fn get(self, key: Singleton<K, L, Bounded>) -> Stream<V, L, Bounded, NoOrder, R>
pub fn get(self, key: impl Into<Optional<K, L, Bounded>>) -> Stream<V, L, Bounded, NoOrder, R>
where
B: IsBounded,
K: Eq + Hash,
{
self.make_bounded()
.entries()
.join(key.into_stream().map(q!(|k| (k, ()))))
.join(key.into().into_stream().map(q!(|k| (k, ()))))
.map(q!(|(_, (v, _))| v))
}

Expand Down
3 changes: 2 additions & 1 deletion lattices/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

use std::cmp::Ordering::{self, *};

pub use cc_traits;
use sealed::sealed;
pub use {cc_traits, variadics};
pub use variadics;

/// Module for definiting algebraic structures and properties.
pub mod algebra;
Expand Down
Loading