daxvena/elemeld - Change AYQYCR7JKWTAZASLQTY5DPVI6A5MN6X4XMPC3GBS5KJRH3EGRPIQC

Consume "other" during cluster merge and replace

Created by daxvena on March 6, 2016

AYQYCR7JKWTAZASLQTY5DPVI6A5MN6X4XMPC3GBS5KJRH3EGRPIQC

Dependencies

In channels

main

Change contents

Insertion in src/cluster.rs at line 69 [3.13]

[2.280]

[3.2086]

    }
    pub fn reset_local(&mut self) {
        for ip in util::my_ips().unwrap() {
            for (i, screen) in self.screens.iter().enumerate() {
                for addr in &screen.addrs {
                    if addr.0.ip() == ip {
                        println!("Local screen at {}", i);
                        self.local = i as Index;
                        return;
                    }
                }
            }
        }
        panic!("Local IP was not found in cluster");

Replacement in src/cluster.rs at line 180 [3.13]

B:BD[3.5036] → [2.536:580]

∅:D[2.580] → [3.5102:5155]

B:BD[3.5102] → [3.5102:5155]

    pub fn merge(&mut self, other: &Self) {
        'outer: for other_screen in &other.screens {

[3.5036]

[2.581]

    pub fn merge(&mut self, other: Self) {
        'outer: for other_screen in other.screens {

Replacement in src/cluster.rs at line 194 [3.13]

B:BD[3.6110] → [2.934:978]

            self.add(other_screen.clone());

[3.6110]

[3.6245]

            self.add(other_screen);

Replacement in src/cluster.rs at line 201 [3.13]

B:BD[3.6332] → [4.766:829]

    pub fn replace<H>(&mut self, host: &H, other: &Self) where

[3.6332]

[4.829]

    pub fn replace<H>(&mut self, host: &H, mut other: Self) where

Deletion in src/cluster.rs at line 204 [3.13]
B:BD[4.864] → [4.864:914]
∅:D[4.914] → [3.6378:6409]
B:BD[3.6378] → [3.6378:6409]
B:BD[3.6409] → [2.979:1016]
```
        let was_focused = self.locally_focused();
        *self = other.clone();
        self.reset_local();
        
```

Replacement in src/cluster.rs at line 205 [3.13]

B:BD[4.943] → [4.943:1019]

            (self.focus,
             self.pos.x,
             self.pos.y);

[4.943]

[4.1019]

            (other.focus,
             other.pos.x,
             other.pos.y);

Replacement in src/cluster.rs at line 209 [3.13]

B:BD[4.1028] → [4.1028:1082]

B:BD[4.1082] → [2.1017:1522]

        self.refocus(host, focus, x, y, was_focused);
    }
    pub fn reset_local(&mut self) {
        'outer: for ip in util::my_ips().unwrap() {
            for (i, screen) in self.screens.iter().enumerate() {
                for addr in &screen.addrs {
                    if addr.0.ip() == ip {
                        println!("Local screen at {}", i);
                        self.local = i as Index;
                        return;
                    }
                }
            }
        }
        panic!("Local IP was not found in cluster");

[4.1028]

[3.6409]

        other.reset_local();
        other.refocus(host, focus, x, y, self.locally_focused());
        *self = other;

Replacement in src/cluster.rs at line 251 [3.13]

B:BD[3.6995] → [3.6995:7046]

#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]

[3.6995]

[2.2317]

#[derive(Clone, PartialEq, Eq, Hash, Debug)]

Replacement in src/cluster.rs at line 284 [3.13]

B:BD[3.8006] → [3.8006:8060]

#[derive(Copy, Clone, Serialize, Deserialize, Debug)]

[3.8006]

[3.8060]

#[derive(Clone, Serialize, Deserialize, Debug)]

Replacement in src/cluster.rs at line 290 [3.13]

B:BD[3.8107] → [3.8107:8161]

#[derive(Copy, Clone, Serialize, Deserialize, Debug)]

[3.8107]

[3.8161]

#[derive(Clone, Serialize, Deserialize, Debug)]

Replacement in src/elemeld.rs at line 14 [3.8294]
B:BD[3.8478] → [3.8478:8508]
```
#[derive(Debug, Copy, Clone)]
```
[3.8478]
[3.8508]
```
#[derive(Clone, Copy, Debug)]
```

Replacement in src/elemeld.rs at line 53 [3.8294]

B:BD[3.9512] → [2.2499:2553]

                        self.cluster.merge(&cluster);

[3.9512]

[3.9572]

                        self.cluster.merge(cluster);

Replacement in src/elemeld.rs at line 58 [3.8294]

B:BD[3.9800] → [4.1083:1151]

                        self.cluster.replace(&self.host, &cluster);

[3.9800]

[3.9856]

                        self.cluster.replace(&self.host, cluster);

Replacement in src/io.rs at line 38 [5.11]

B:BD[3.11447] → [3.11447:11516]

#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Copy, Clone)]

[3.11447]

[3.11516]

#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Debug)]