FIXED TODO: Avoided take() function on the run editor method

[rrsmart8]

pub fn run(&mut self, file_name: &Option<String>) -> Result<(), Error> {
    // File handling logic
    if let Some(path) = file_name.as_ref().and_then(|p| Some(sys::path(p.as_str()))) {
        self.select_syntax_highlight(path.as_path())?;
        self.load(path.as_path())?;
        self.file_name = Some(path.to_string_lossy().to_string());
    } else {
        self.rows.push(Row::new(Vec::new()));
        self.file_name = None;
    }

    // Main loop
    loop {
        // Display mode status if present
        if let Some(mode) = self.prompt_mode.as_ref() {
            set_status!(self, "{}", mode.status_msg());
        }

        // Refresh screen, get user input
        self.refresh_screen()?;
        let key = self.loop_until_keypress()?;

        // Process keypress without using take() on self.prompt_mode
        self.prompt_mode = match self.prompt_mode.map_or_else(|| None, |pm| Some(pm.process_keypress(self, &key)?)) {
            None => match self.process_keypress(&key) {
                (true, _) => return Ok(()),
                (false, new_mode) => Some(new_mode),
            },
            pm => pm,
        };
    }
}

[rrsmart8]

Handled the case where the file already exists when the user tries to save_as

[alexandruradovici]

Please describe your changes in the pull request description.

[alexandruradovici]

Remove the TODO comment.

[alexandruradovici]

This has the same effect as take, I would leave the take function in place has it adds more meaning. Your solution also adds an extra line of code.

[alexandruradovici]

I think you could avoid using take by borrowing the value in the match arm:

Key::Char(SAVE) => match self.file_name {
                // TODO: Can we avoid using take() then reassigning the value to file_name?
                Some(ref file_name) => {
                    self.save_and_handle_io_errors(file_name);
                    self.file_name = Some(file_name);
                // ...

[alexandruradovici]

Why use map_or_else?

[alexandruradovici]

Why use map_or_else?