refactor: made requested changes

Signed-off-by: addrian-77 <lunguadrian30@gmail.com>

Author: addrian-77

Cargo.toml

@@ -4,7 +4,7 @@
 
 [workspace]
 
-resolver = "2"
+resolver = "3"
 
 members = [
     "tockloader-cli",

tockloader-cli/src/cli.rs

@@ -71,6 +71,7 @@ fn get_channel_args() -> Vec<clap::Arg> {
         .collect::<Vec<_>>();
 
     vec![
+        // TODO(george-cosma): Change default to pconsole when new format is implemented and adopted into tock
         arg!(--protocol <PROTOCOL> "Choose between legacy and pconsole protocol")
             .default_value("legacy")
             .value_parser(["legacy", "pconsole"]),

tockloader-cli/src/main.rs

@@ -72,6 +72,7 @@ fn get_board_settings(user_options: &ArgMatches) -> BoardSettings {
 }
 
 fn using_serial(user_options: &ArgMatches) -> bool {
+    // TODO: refactor this in the future
     *user_options.get_one::<bool>("serial").unwrap_or(&false)
         || user_options
             .get_one::<String>("protocol")
@@ -139,7 +140,7 @@ async fn main() -> Result<()> {
             let protocol = sub_matches
                 .get_one::<String>("protocol")
                 .map(String::as_str)
-                .unwrap_or("legacy");
+                .unwrap();
             match protocol {
                 "legacy" => {
                     let conn = open_connection(sub_matches).await?;
@@ -148,7 +149,7 @@ async fn main() -> Result<()> {
                         TockloaderConnection::Serial(serial_connection) => {
                             tock_process_console::legacy::run(
                                 serial_connection
-                                    .get_stream()
+                                    .into_inner_stream()
                                     .expect("Expected board to be connected."),
                             )
                             .await;

tockloader-lib/src/connection.rs

@@ -117,7 +117,7 @@ impl SerialConnection {
             port,
         }
     }
-    pub fn get_stream(self) -> Option<SerialStream> {
+    pub fn into_inner_stream(self) -> Option<SerialStream> {
         self.stream
     }
 }