jcdickinson/pijul - Change 3OF3DHLM6FGCN7GTKZUE5U5VL3HB3SCDAJ5AL3KD6MDVQ4VLJQUQC

Fixing a panic with narrow terminal windows

Created by pmeunier on May 25, 2021

3OF3DHLM6FGCN7GTKZUE5U5VL3HB3SCDAJ5AL3KD6MDVQ4VLJQUQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/progress.rs at line 190 [3.5323]

B:BD[3.8691] → [3.8691:8733]

                let w = w - npre - npost;

[3.8691]

[3.8733]

                let w_digits = {
                    let mut n = *n;
                    let mut nd = if n == 0 { 1 } else { 0 } + if *i == 0 { 1 } else { 0 };
                    while n > 0 {
                        n /= 10;
                        nd += 1
                    }
                    let mut n = *i;
                    while n > 0 {
                        n /= 10;
                        nd += 1
                    }
                    nd
                };
                let w = w - npre - npost - w_digits;

Replacement in pijul/src/progress.rs at line 232 [3.5323]

B:BD[3.9240] → [4.145:194]

B:BD[4.194] → [2.0:82]

∅:D[2.82] → [3.9298:9630]

B:BD[3.9298] → [3.9298:9630]

                let mut nw = w - wb + npost - 6;
                if *n == 0 {
                    nw -= 2
                } else {
                    let mut n = *n;
                    while n > 0 {
                        n /= 10;
                        nw -= 1
                    }
                    let mut n = *i;
                    while n > 0 {
                        n /= 10;
                        nw -= 1
                    }
                }

[3.9240]

[3.9630]

                let nw = w + npost - wb - 6;