From 4bd350c9480e416c0df6de488d6815b7a3db8c16 Mon Sep 17 00:00:00 2001
From: Lotte Steenbrink <lotte.steenbrink@ferrous-systems.com>
Date: Fri, 3 Jul 2020 12:22:58 +0200
Subject: [PATCH] usb/src/lib.rs: make set_address() run by default, move
 upwards

---
 advanced/common/usb/src/lib.rs | 36 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/advanced/common/usb/src/lib.rs b/advanced/common/usb/src/lib.rs
index 55d2ba2..c66da16 100644
--- a/advanced/common/usb/src/lib.rs
+++ b/advanced/common/usb/src/lib.rs
@@ -96,7 +96,6 @@ pub enum Descriptor {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(TODO)]
     use core::num::NonZeroU8;
 
     use crate::{Descriptor, Request};
@@ -121,24 +120,6 @@ mod tests {
         //                                                 ^^^^
     }
 
-    #[cfg(TODO)]
-    #[test]
-    fn get_descriptor_configuration() {
-        // OK: GET_DESCRIPTOR Configuration 0 [length=9]
-        assert_eq!(
-            Request::parse(0b1000_0000, 0x06, 0x02_00, 0, 9),
-            Ok(Request::GetDescriptor {
-                descriptor: Descriptor::Configuration { index: 0 },
-                length: 9
-            })
-        );
-
-        // has language ID but shouldn't
-        assert!(Request::parse(0b1000_0000, 0x06, 0x02_00, 1033, 9).is_err());
-        //                                                 ^^^^
-    }
-
-    #[cfg(TODO)]
     #[test]
     fn set_address() {
         // OK: SET_ADDRESS 16
@@ -168,6 +149,23 @@ mod tests {
         //                                                    ^
     }
 
+    #[cfg(TODO)]
+    #[test]
+    fn get_descriptor_configuration() {
+        // OK: GET_DESCRIPTOR Configuration 0 [length=9]
+        assert_eq!(
+            Request::parse(0b1000_0000, 0x06, 0x02_00, 0, 9),
+            Ok(Request::GetDescriptor {
+                descriptor: Descriptor::Configuration { index: 0 },
+                length: 9
+            })
+        );
+
+        // has language ID but shouldn't
+        assert!(Request::parse(0b1000_0000, 0x06, 0x02_00, 1033, 9).is_err());
+        //                                                 ^^^^
+    }
+
     #[cfg(TODO)]
     #[test]
     fn set_configuration() {