AfoHT/parkett - Change JPTYS433ESGA2UUNKQT4JMAWFU7KVIU7F5RKDZTUR7RR5A2COBVQC

Cleanup, clippy

Created by Henrik Tjäder on September 17, 2021

JPTYS433ESGA2UUNKQT4JMAWFU7KVIU7F5RKDZTUR7RR5A2COBVQC

Dependencies

In channels

main

Change contents

Insertion in src/bin/main.rs at line 20 [3.1]

[2.311]


    //let oldstuff = Plank {
    //length: 1000,
    //endpiece: false,
    //new: false,
    //};
    //let oldstuff2 = Plank {
    //length: 1000,
    //endpiece: false,
    //new: false,
    //};
    //ms.store_used(oldstuff);
    //ms.store_used(oldstuff2);

Replacement in src/bin/main.rs at line 48 [3.1]

B:BD[4.638] → [2.611:671]

fn floor_print(floor: &Floor, ms: &MaterialStorage) -> () {

[4.638]

[2.671]

fn floor_print(floor: &Floor, ms: &MaterialStorage) {

Replacement in src/bin/main.rs at line 86 [3.1]

B:BD[5.1479] → [2.1274:1346]

fn floor_build(floor: &mut Floor, mut ms: &mut MaterialStorage) -> () {

[5.1479]

[6.629]

fn floor_build(floor: &mut Floor, mut ms: &mut MaterialStorage) {

Replacement in src/bin/main.rs at line 95 [3.1]
B:BD[2.1595] → [2.1595:1622]
```
                return ();
```
[2.1595]
[2.1622]
```
                return;
```

Replacement in src/bin/main.rs at line 126 [3.1]

B:BD[7.4041] → [8.658:722]

∅:D[8.722] → [7.4103:4236]

B:BD[7.4103] → [7.4103:4236]

        if plank.length() > (ROOMLENGTH - row.get_coverage()) {
            // Cut the plank to length
            let (plankpart, leftover) = plank.cut_to_length(ROOMLENGTH - row.get_coverage());

[7.4041]

[9.1796]

        match plank.length() {
            length if length < (ROOMLENGTH - row.get_coverage()) => {
                // Cut the plank to length
                let (plankpart, leftover) = plank.cut_to_length(ROOMLENGTH - row.get_coverage());

Replacement in src/bin/main.rs at line 131 [3.1]

B:BD[9.1797] → [9.1797:1857]

B:BD[9.1857] → [10.103:149]

B:BD[10.149] → [7.4237:4287]

∅:D[10.197] → [9.1857:1889]

∅:D[7.4287] → [9.1857:1889]

B:BD[9.1857] → [9.1857:1889]

B:BD[9.1889] → [2.1805:1901]

∅:D[8.724] → [7.4288:4433]

∅:D[2.1901] → [7.4288:4433]

B:BD[9.1969] → [7.4288:4433]

            // Add the remainder of plank to the row (move)
            // also increase the row coverage
            row.add_coverage(plankpart.length());
            row.add(plankpart);
            // Add the remaining plank to material storage
            ms.store_used(leftover);
        } else if plank.length() == ROOMLENGTH - row.get_coverage() {
            // If the plank is the same length as the room, no need to cut

[9.1797]

[7.4433]

                // Add the remainder of plank to the row (move)
                // also increase the row coverage
                row.add_coverage(plankpart.length());
                row.add(plankpart);
                // Add the remaining plank to material storage
                ms.store_used(leftover);
            }
            length if length == (ROOMLENGTH - row.get_coverage()) => {
                // If the plank is the same length as the room, no need to cut

Replacement in src/bin/main.rs at line 141 [3.1]

B:BD[7.4434] → [7.4434:4564]

            // Use the whole plank, add to row coverage
            row.add_coverage(plank.length());
            row.add(plank);

[7.4434]

[7.4564]

                // Use the whole plank, add to row coverage
                row.add_coverage(plank.length());
                row.add(plank);

Replacement in src/bin/main.rs at line 145 [3.1]

B:BD[7.4565] → [7.4565:4610]

B:BD[7.4610] → [2.1902:1942]

∅:D[2.1942] → [11.335:370]

B:BD[7.4664] → [11.335:370]

B:BD[7.4694] → [7.4694:4772]

            // Take a new plank and continue
            plank = ms.try_get_used()?;
            row.add_used_planks();
        } else {
            // Plank is shorter than the room, need multiple

[7.4565]

[7.4772]

                // Take a new plank and continue
                plank = ms.try_get_used()?;
                row.add_used_planks();
            }
            _ => {
                // Plank is shorter than the room, need multiple

Replacement in src/bin/main.rs at line 152 [3.1]

B:BD[7.4773] → [7.4773:4903]

            // Use the whole plank, add to row coverage
            row.add_coverage(plank.length());
            row.add(plank);

[7.4773]

[7.4903]

                // Use the whole plank, add to row coverage
                row.add_coverage(plank.length());
                row.add(plank);

Replacement in src/bin/main.rs at line 156 [3.1]

B:BD[7.4904] → [7.4904:4949]

B:BD[7.4949] → [2.1943:1983]

∅:D[2.1983] → [11.371:406]

B:BD[7.5003] → [11.371:406]

            // Take a new plank and continue
            plank = ms.try_get_used()?;
            row.add_used_planks();

[7.4904]

[9.1969]

                // Take a new plank and continue
                plank = ms.try_get_used()?;
                row.add_used_planks();
            }

Replacement in src/constants.rs at line 12 [2.2111]
B:BD[2.2370] → [2.2370:2396]
```
pub static PLAY: u32 = 5;
```
[2.2370]
[2.2396]
```
pub static PLAY: u32 = 10;
```
Replacement in src/constants.rs at line 24 [2.2111]
B:BD[2.2632] → [2.2632:2670]
```
pub static AVAILABLEPLANKS: u32 = 30;
```
[2.2632]
```
pub static AVAILABLEPLANKS: u32 = 40;
```

Replacement in src/lib.rs at line 3 [7.1]

B:BD[2.2757] → [2.2757:2821]

use constants::{PLANKMAX, PLANKMIN, SAWBLADE, AVAILABLEPLANKS};

[2.2757]

[7.77]

use constants::{AVAILABLEPLANKS, PLANKMAX, PLANKMIN, SAWBLADE};

Replacement in src/lib.rs at line 15 [7.1]
B:BD[12.210] → [12.210:249]
```
    /// Create a new, default storage 
```
[12.210]
[12.249]
```
    /// Create a new, default storage
```

Replacement in src/lib.rs at line 70 [7.1]

B:BD[7.148] → [7.148:200]

    length: u32,
    endpiece: bool,
    new: bool,

[7.148]

[7.200]

    pub length: u32,
    pub endpiece: bool,
    pub new: bool,

Replacement in src/lib.rs at line 99 [7.1]

B:BD[7.737] → [7.737:780]

    pub fn set_endpiece(&mut self) -> () {

[7.737]

[7.780]

    pub fn set_endpiece(&mut self) {

Replacement in src/lib.rs at line 170 [7.1]
B:BD[7.2133] → [7.2133:2172]
```
    pub fn set_full(&mut self) -> () {
```
[7.2133]
[7.2172]
```
    pub fn set_full(&mut self) {
```

Replacement in src/lib.rs at line 174 [7.1]

B:BD[7.2205] → [2.3469:3531]

    pub fn set_first_and_last_as_endpieces(&mut self) -> () {

[7.2205]

[2.3531]

    pub fn set_first_and_last_as_endpieces(&mut self) {

Replacement in src/lib.rs at line 196 [7.1]

B:BD[11.85] → [11.85:131]

    pub fn add_used_planks(&mut self) -> () {

[11.85]

[11.131]

    pub fn add_used_planks(&mut self) {

Replacement in src/lib.rs at line 201 [7.1]

B:BD[7.2511] → [7.2511:2569]

    pub fn add_coverage(&mut self, coverage: u32) -> () {

[7.2511]

[7.2569]

    pub fn add_coverage(&mut self, coverage: u32) {

Replacement in src/lib.rs at line 210 [7.1]

B:BD[7.2763] → [7.2763:2811]

    pub fn add(&mut self, plank: Plank) -> () {

[7.2763]

[7.2811]

    pub fn add(&mut self, plank: Plank) {

Replacement in src/lib.rs at line 240 [7.1]

B:BD[6.245] → [6.245:288]

    pub fn set_complete(&mut self) -> () {

[6.245]

[6.288]

    pub fn set_complete(&mut self) {

Replacement in src/lib.rs at line 265 [7.1]
∅:D[6.359] → [7.3423:3467]
B:BD[7.3423] → [7.3423:3467]
```
    pub fn add(&mut self, row: Row) -> () {
```
[6.359]
[7.3467]
```
    pub fn add(&mut self, row: Row) {
```

Replacement in src/lib.rs at line 275 [7.1]

B:BD[6.535] → [6.535:593]

    pub fn add_coverage(&mut self, coverage: u32) -> () {

[6.535]

[6.593]

    pub fn add_coverage(&mut self, coverage: u32) {