Skip to content

Commit cb28634

Browse files
author
Jay Jackson
committed
move to turbofish
1 parent 0089d3b commit cb28634

File tree

1 file changed

+33
-81
lines changed

1 file changed

+33
-81
lines changed

‎src/lib.rs

Lines changed: 33 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ where
314314
S: ScancodeSet,
315315
{
316316
/// Make a new Keyboard object with the given layout.
317-
pub fn new(_layout: T, _set: S, handle_ctrl: HandleControl) -> Keyboard<T, S> {
317+
pub fn new(handle_ctrl: HandleControl) -> Keyboard<T, S> {
318318
Keyboard {
319319
register: 0,
320320
num_bits: 0,
@@ -564,11 +564,8 @@ mod test {
564564

565565
#[test]
566566
fn test_f9() {
567-
let mut k = Keyboard::new(
568-
layouts::Us104Key,
569-
ScancodeSet2,
570-
HandleControl::MapLettersToUnicode,
571-
);
567+
let mut k =
568+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
572569
// start
573570
assert_eq!(k.add_bit(false), Ok(None));
574571
// 8 data bits (LSB first)
@@ -591,11 +588,8 @@ mod test {
591588

592589
#[test]
593590
fn test_f9_word() {
594-
let mut k = Keyboard::new(
595-
layouts::Us104Key,
596-
ScancodeSet2,
597-
HandleControl::MapLettersToUnicode,
598-
);
591+
let mut k =
592+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
599593
assert_eq!(
600594
k.add_word(0x0402),
601595
Ok(Some(KeyEvent::new(KeyCode::F9, KeyState::Down)))
@@ -604,11 +598,8 @@ mod test {
604598

605599
#[test]
606600
fn test_f9_byte() {
607-
let mut k = Keyboard::new(
608-
layouts::Us104Key,
609-
ScancodeSet2,
610-
HandleControl::MapLettersToUnicode,
611-
);
601+
let mut k =
602+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
612603
assert_eq!(
613604
k.add_byte(0x01),
614605
Ok(Some(KeyEvent::new(KeyCode::F9, KeyState::Down)))
@@ -617,11 +608,8 @@ mod test {
617608

618609
#[test]
619610
fn test_keyup_keydown() {
620-
let mut k = Keyboard::new(
621-
layouts::Us104Key,
622-
ScancodeSet2,
623-
HandleControl::MapLettersToUnicode,
624-
);
611+
let mut k =
612+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
625613
assert_eq!(
626614
k.add_byte(0x01),
627615
Ok(Some(KeyEvent::new(KeyCode::F9, KeyState::Down)))
@@ -639,11 +627,8 @@ mod test {
639627

640628
#[test]
641629
fn test_f5() {
642-
let mut k = Keyboard::new(
643-
layouts::Us104Key,
644-
ScancodeSet2,
645-
HandleControl::MapLettersToUnicode,
646-
);
630+
let mut k =
631+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
647632
// start
648633
assert_eq!(k.add_bit(false), Ok(None));
649634
// 8 data bits (LSB first)
@@ -666,11 +651,8 @@ mod test {
666651

667652
#[test]
668653
fn test_f5_up() {
669-
let mut k = Keyboard::new(
670-
layouts::Us104Key,
671-
ScancodeSet2,
672-
HandleControl::MapLettersToUnicode,
673-
);
654+
let mut k =
655+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
674656
// Send F0
675657

676658
// start
@@ -713,11 +695,8 @@ mod test {
713695

714696
#[test]
715697
fn test_shift() {
716-
let mut k = Keyboard::new(
717-
layouts::Uk105Key,
718-
ScancodeSet2,
719-
HandleControl::MapLettersToUnicode,
720-
);
698+
let mut k =
699+
Keyboard::<layouts::Uk105Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
721700
// A with left shift held
722701
assert_eq!(
723702
k.process_keyevent(KeyEvent::new(KeyCode::ShiftLeft, KeyState::Down)),
@@ -815,11 +794,8 @@ mod test {
815794

816795
#[test]
817796
fn test_ctrl() {
818-
let mut k = Keyboard::new(
819-
layouts::Us104Key,
820-
ScancodeSet2,
821-
HandleControl::MapLettersToUnicode,
822-
);
797+
let mut k =
798+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
823799
// Normal
824800
assert_eq!(
825801
k.process_keyevent(KeyEvent::new(KeyCode::A, KeyState::Down)),
@@ -876,11 +852,8 @@ mod test {
876852

877853
#[test]
878854
fn test_numlock() {
879-
let mut k = Keyboard::new(
880-
layouts::Uk105Key,
881-
ScancodeSet2,
882-
HandleControl::MapLettersToUnicode,
883-
);
855+
let mut k =
856+
Keyboard::<layouts::Uk105Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
884857

885858
// Numlock ON by default
886859
assert_eq!(
@@ -946,11 +919,8 @@ mod test {
946919

947920
#[test]
948921
fn test_set_1_down_up_down() {
949-
let mut k = Keyboard::new(
950-
layouts::Us104Key,
951-
ScancodeSet1,
952-
HandleControl::MapLettersToUnicode,
953-
);
922+
let mut k =
923+
Keyboard::<layouts::Us104Key, ScancodeSet1>::new(HandleControl::MapLettersToUnicode);
954924
assert_eq!(
955925
k.add_byte(0x1e),
956926
Ok(Some(KeyEvent::new(KeyCode::A, KeyState::Down)))
@@ -967,11 +937,8 @@ mod test {
967937

968938
#[test]
969939
fn test_set_1_ext_down_up_down() {
970-
let mut k = Keyboard::new(
971-
layouts::Us104Key,
972-
ScancodeSet1,
973-
HandleControl::MapLettersToUnicode,
974-
);
940+
let mut k =
941+
Keyboard::<layouts::Us104Key, ScancodeSet1>::new(HandleControl::MapLettersToUnicode);
975942
assert_eq!(k.add_byte(0xe0), Ok(None));
976943
assert_eq!(
977944
k.add_byte(0x1c),
@@ -986,11 +953,8 @@ mod test {
986953

987954
#[test]
988955
fn test_set_2_poweron() {
989-
let mut k = Keyboard::new(
990-
layouts::Us104Key,
991-
ScancodeSet2,
992-
HandleControl::MapLettersToUnicode,
993-
);
956+
let mut k =
957+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
994958
assert_eq!(
995959
k.add_byte(0xAA),
996960
Ok(Some(KeyEvent::new(
@@ -1002,11 +966,8 @@ mod test {
1002966

1003967
#[test]
1004968
fn test_set_2_toomanykeys() {
1005-
let mut k = Keyboard::new(
1006-
layouts::Us104Key,
1007-
ScancodeSet2,
1008-
HandleControl::MapLettersToUnicode,
1009-
);
969+
let mut k =
970+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
1010971
assert_eq!(
1011972
k.add_byte(0x00),
1012973
Ok(Some(KeyEvent::new(
@@ -1018,11 +979,8 @@ mod test {
1018979

1019980
#[test]
1020981
fn test_set_2_down_up() {
1021-
let mut k = Keyboard::new(
1022-
layouts::Us104Key,
1023-
ScancodeSet2,
1024-
HandleControl::MapLettersToUnicode,
1025-
);
982+
let mut k =
983+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
1026984
assert_eq!(
1027985
k.add_byte(0x29),
1028986
Ok(Some(KeyEvent::new(KeyCode::Spacebar, KeyState::Down)))
@@ -1054,11 +1012,8 @@ mod test {
10541012

10551013
#[test]
10561014
fn test_set_2_ext_down_up() {
1057-
let mut k = Keyboard::new(
1058-
layouts::Us104Key,
1059-
ScancodeSet2,
1060-
HandleControl::MapLettersToUnicode,
1061-
);
1015+
let mut k =
1016+
Keyboard::<layouts::Us104Key, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
10621017
assert_eq!(k.add_byte(0xE0), Ok(None));
10631018
assert_eq!(
10641019
k.add_byte(0x6C),
@@ -1074,11 +1029,8 @@ mod test {
10741029

10751030
#[test]
10761031
fn test_frazert() {
1077-
let mut k = Keyboard::new(
1078-
layouts::Azerty,
1079-
ScancodeSet2,
1080-
HandleControl::MapLettersToUnicode,
1081-
);
1032+
let mut k =
1033+
Keyboard::<layouts::Azerty, ScancodeSet2>::new(HandleControl::MapLettersToUnicode);
10821034
assert_eq!(
10831035
k.process_keyevent(KeyEvent::new(KeyCode::NumpadSlash, KeyState::Down)),
10841036
Some(DecodedKey::Unicode('/'))

0 commit comments

Comments
 (0)