Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions crates/cargo-gpu/src/spirv_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,19 @@ impl SpirvCli {
}
log::debug!("asking for consent to install the required toolchain");
crossterm::terminal::enable_raw_mode().context("enabling raw mode")?;
crate::user_output!("{prompt} [y/n]: ");
let input = crossterm::event::read().context("reading crossterm event")?;
crate::user_output!("{prompt} [y/n]: \n");
let mut input = crossterm::event::read().context("reading crossterm event")?;

if let crossterm::event::Event::Key(crossterm::event::KeyEvent {
code: crossterm::event::KeyCode::Enter,
kind: crossterm::event::KeyEventKind::Release,
..
}) = input
{
// In Powershell, programs will potentially observe the Enter key release after they started
// (see crossterm#124). If that happens, re-read the input.
input = crossterm::event::read().context("re-reading crossterm event")?;
}
crossterm::terminal::disable_raw_mode().context("disabling raw mode")?;

if let crossterm::event::Event::Key(crossterm::event::KeyEvent {
Expand Down