Skip to content

Commit 0f1b2ea

Browse files
committed
Fix tests
1 parent 675da40 commit 0f1b2ea

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

scopegraphs/src/containers/scope.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
3636
/// # trait DBound<'sg>: Hash + Eq + 'sg {}
3737
///
3838
/// fn test<'sg, 'rslv, LABEL: LBound<'sg>, DATA: DBound<'sg>, DWFO>(
39-
/// cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO>
39+
/// cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO, DWFO>
4040
/// ) { }
4141
///
4242
/// # fn scope_vec<'sg, 'rslv, LABEL: LBound<'sg>, DATA: DBound<'sg>>() {
@@ -64,9 +64,9 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
6464
/// # use std::hash::Hash;
6565
///
6666
///
67-
/// fn test<'sg, 'rslv, LABEL: Clone + Hash + Eq + Debug + 'sg, DATA: Hash + Eq + 'sg, DWFO>(cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO>) {
68-
///
69-
/// }
67+
/// fn test<'sg, 'rslv, LABEL: Clone + Hash + Eq + Debug + 'sg, DATA: Hash + Eq + 'sg, DWFO>(
68+
/// cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO, DWFO>
69+
/// ) { }
7070
/// ```
7171
///
7272
/// ```no_run
@@ -78,9 +78,9 @@ pub trait ScopeContainer<'sg, 'rslv, LABEL: Debug + 'sg, DATA: 'sg>: Debug {
7878
/// test::<'_, '_, (), (), bool>(Result::<_, ()>::Ok(Vec::<Scope>::new()));
7979
/// test::<'_, '_, (), (), Result<bool, ()>>(Result::<_, ()>::Ok(Vec::<Scope>::new()));
8080
///
81-
/// fn test<'sg, 'rslv, LABEL: Clone + Hash + Eq + Debug + 'sg, DATA: Hash + Eq + 'sg, DWFO>(cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO>) {
82-
///
83-
/// }
81+
/// fn test<'sg, 'rslv, LABEL: Clone + Hash + Eq + Debug + 'sg, DATA: Hash + Eq + 'sg, DWFO>(
82+
/// cont: impl ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO, DWFO>
83+
/// ) { }
8484
/// ```
8585
///
8686
pub trait ScopeContainerWf<'sg, 'rslv, LABEL, DATA, DWFO, DEQO>:

scopegraphs/src/resolve/lookup.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,19 @@ where
227227
let mut base_env = base_env.clone();
228228
let sub_env = local_self.resolve_edge(path_wellformedness.clone(), edge, path);
229229
sub_env.flat_map(move |sub_env| {
230-
let filtered_env: EnvC<'sg, 'rslv, CMPL, LABEL, DATA, DWF::Output, DEq::Output> =
231-
Filterable::filter(&base_env, sub_env, local_self.data_equiv);
232-
filtered_env.flat_map(move |filtered_env| {
233-
base_env.merge(filtered_env);
234-
base_env.into()
235-
})
230+
let filtered_env: EnvC<
231+
'sg,
232+
'rslv,
233+
CMPL,
234+
LABEL,
235+
DATA,
236+
DWF::Output,
237+
DEq::Output,
238+
> = Filterable::filter(&base_env, sub_env, local_self.data_equiv);
239+
filtered_env.flat_map(move |filtered_env| {
240+
base_env.merge(filtered_env);
241+
base_env.into()
242+
})
236243
})
237244
}
238245
}))

0 commit comments

Comments
 (0)