Skip to content

Commit 5e33c7f

Browse files
committed
Reverting commits, changing interface/context ordering
1 parent ab8a319 commit 5e33c7f

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

examples/simple.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,20 @@ fn main() {
122122
endwin();
123123
}
124124

125-
fn enter_root(_menu: &Menu<Output, Context>, _context: &mut Context, interface: &mut Output) {
125+
fn enter_root(_menu: &Menu<Output, Context>, interface: &mut Output, _context: &mut Context) {
126126
writeln!(interface, "In enter_root").unwrap();
127127
}
128128

129-
fn exit_root(_menu: &Menu<Output, Context>, _context: &mut Context, interface: &mut Output) {
129+
fn exit_root(_menu: &Menu<Output, Context>, interface: &mut Output, _context: &mut Context) {
130130
writeln!(interface, "In exit_root").unwrap();
131131
}
132132

133133
fn select_foo(
134134
_menu: &Menu<Output, Context>,
135135
item: &Item<Output, Context>,
136136
args: &[&str],
137-
_context: &mut Context,
138137
interface: &mut Output,
138+
_context: &mut Context,
139139
) {
140140
writeln!(interface, "In select_foo. Args = {:?}", args).unwrap();
141141
writeln!(
@@ -174,26 +174,26 @@ fn select_bar(
174174
_menu: &Menu<Output, Context>,
175175
_item: &Item<Output, Context>,
176176
args: &[&str],
177-
_context: &mut Context,
178177
interface: &mut Output,
178+
_context: &mut Context,
179179
) {
180180
writeln!(interface, "In select_bar. Args = {:?}", args).unwrap();
181181
}
182182

183-
fn enter_sub(_menu: &Menu<Output, Context>, _context: &mut Context, interface: &mut Output) {
183+
fn enter_sub(_menu: &Menu<Output, Context>, interface: &mut Output, _context: &mut Context) {
184184
writeln!(interface, "In enter_sub").unwrap();
185185
}
186186

187-
fn exit_sub(_menu: &Menu<Output, Context>, _context: &mut Context, interface: &mut Output) {
187+
fn exit_sub(_menu: &Menu<Output, Context>, interface: &mut Output, _context: &mut Context) {
188188
writeln!(interface, "In exit_sub").unwrap();
189189
}
190190

191191
fn select_baz(
192192
_menu: &Menu<Output, Context>,
193193
_item: &Item<Output, Context>,
194194
args: &[&str],
195-
_context: &mut Context,
196195
interface: &mut Output,
196+
_context: &mut Context,
197197
) {
198198
writeln!(interface, "In select_baz: Args = {:?}", args).unwrap();
199199
}
@@ -202,8 +202,8 @@ fn select_quux(
202202
_menu: &Menu<Output, Context>,
203203
_item: &Item<Output, Context>,
204204
args: &[&str],
205-
_context: &mut Context,
206205
interface: &mut Output,
206+
_context: &mut Context,
207207
) {
208208
writeln!(interface, "In select_quux: Args = {:?}", args).unwrap();
209209
}

src/lib.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
pub mod menu_manager;
88

99
/// The type of function we call when we enter/exit a menu.
10-
pub type MenuCallbackFn<I, T> = fn(menu: &Menu<I, T>, context: &mut T, interface: &mut I);
10+
pub type MenuCallbackFn<I, T> = fn(menu: &Menu<I, T>, interface: &mut I, context: &mut T);
1111

1212
/// The type of function we call when we a valid command has been entered.
1313
pub type ItemCallbackFn<I, T> =
14-
fn(menu: &Menu<I, T>, item: &Item<I, T>, args: &[&str], context: &mut T, interface: &mut I);
14+
fn(menu: &Menu<I, T>, item: &Item<I, T>, args: &[&str], interface: &mut I, context: &mut T);
1515

1616
#[derive(Debug)]
1717
/// Describes a parameter to the command
@@ -262,7 +262,7 @@ where
262262
context: &mut T,
263263
) -> Self {
264264
if let Some(cb_fn) = menu.entry {
265-
cb_fn(&menu, context, &mut interface);
265+
cb_fn(&menu, &mut interface, context);
266266
}
267267
let mut r = Runner {
268268
menu_mgr: menu_manager::MenuManager::new(menu),
@@ -394,7 +394,7 @@ where
394394
}
395395
} else if cmd == "exit" && self.menu_mgr.depth() != 0 {
396396
if let Some(cb_fn) = menu.exit {
397-
cb_fn(menu, context, &mut self.interface);
397+
cb_fn(menu, &mut self.interface, context);
398398
}
399399
self.menu_mgr.pop_menu();
400400
} else {
@@ -416,7 +416,7 @@ where
416416
),
417417
ItemType::Menu(_) => {
418418
if let Some(cb_fn) = self.menu_mgr.get_menu(None).entry {
419-
cb_fn(menu, context, &mut self.interface);
419+
cb_fn(menu, &mut self.interface, context);
420420
}
421421
self.menu_mgr.push_menu(i);
422422
}
@@ -651,14 +651,14 @@ where
651651
parent_menu,
652652
item,
653653
&argument_buffer[0..argument_count],
654-
context,
655654
interface,
655+
context,
656656
);
657657
}
658658
} else {
659659
// Definitely no arguments
660660
if mandatory_parameter_count == 0 {
661-
callback_function(parent_menu, item, &[], context, interface);
661+
callback_function(parent_menu, item, &[], interface, context);
662662
} else {
663663
writeln!(interface, "Error: Insufficient arguments given").unwrap();
664664
}
@@ -674,8 +674,8 @@ mod tests {
674674
_menu: &Menu<(), u32>,
675675
_item: &Item<(), u32>,
676676
_args: &[&str],
677-
_context: &mut u32,
678677
_interface: &mut (),
678+
_context: &mut u32,
679679
) {
680680
}
681681

0 commit comments

Comments
 (0)