Compare commits

..

No commits in common. "ebc5fe5425bd41bacf5021f38395a7b6db11ba70" and "d54bddde27bf48ae044c055702e44eb917ecefd4" have entirely different histories.

2 changed files with 8 additions and 1 deletions

View file

@ -71,6 +71,8 @@ impl CupCircle {
// keep subtracting one until it finds a cup that wasn't just picked up. If at any point in
// this process the value goes below the lowest value on any cup's label, it wraps around to
// the highest value on any cup's label instead.
//
// TODO: use std::cmp::Ord::clamp when stabilized (Rust 1.50)
let mut destination = if current > 1 { current - 1 } else { self.max() };
while removed_cups.contains(&destination) {
destination = if destination > 1 {
@ -191,6 +193,8 @@ impl FastCupCircle {
// keep subtracting one until it finds a cup that wasn't just picked up. If at any point in
// this process the value goes below the lowest value on any cup's label, it wraps around to
// the highest value on any cup's label instead.
//
// TODO: use std::cmp::Ord::clamp when stabilized (Rust 1.50)
let mut destination = if self.current > 1 {
self.current - 1
} else {

View file

@ -69,7 +69,10 @@ impl std::str::FromStr for Command {
type Err = anyhow::Error;
fn from_str(s: &str) -> Result<Self> {
let (word, number) = s.split_once(' ').context("couldn't split command")?;
let mut split = s.split(' ');
let word = split.next().context("couldn't find word in command")?;
let number = split.next().context("couldn't find number in command")?;
let number = number.parse()?;