marijan/pijul - Change C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC

Simplify return type for remote get_id

Created by ammkrn on July 27, 2021

C5XGFNKIX3RM6KOKRYTECBDDRDAE33JWIVJAJJTEFKFXQNXHEKHQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 738 [3.25380]

B:BD[3.37998] → [4.3927:4027]

    pub async fn get_id(&mut self) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {

[3.37998]

[4.4027]

    pub async fn get_id(&mut self) -> Result<libpijul::pristine::RemoteId, anyhow::Error> {

Replacement in pijul/src/remote/ssh.rs at line 747 [3.25380]

B:BD[4.4320] → [4.4320:4348]

        Ok(receiver.await?)

[4.4320]

[4.4348]

        receiver
            .await?
            .ok_or_else(|| anyhow::anyhow!("Unable to retrieve RemoteId for Ssh remote"))

Replacement in pijul/src/remote/mod.rs at line 169 [3.52474]

B:BD[3.56888] → [4.6335:6411]

∅:D[4.6411] → [5.1579:1636]

B:BD[5.1579] → [5.1579:1636]

        let id = if let Some(id) = self.get_id(txn).await? {
            id
        } else {
            return Ok(None);
        };

[3.56888]

[4.6412]

        let id = self.get_id(txn).await?;

Replacement in pijul/src/remote/mod.rs at line 265 [3.52474]

B:BD[4.6730] → [4.6730:6801]

    ) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {

[4.6730]

[4.6801]

    ) -> Result<libpijul::pristine::RemoteId, anyhow::Error> {

Replacement in pijul/src/remote/mod.rs at line 272 [3.52474]

B:BD[4.7116] → [2.385:441]

                    Ok(Some(*txn.id(&*channel.read())))

[4.7116]

[5.2110]

                    Ok(*txn.id(&*channel.read()))

Replacement in pijul/src/remote/mod.rs at line 274 [3.52474]

B:BD[5.2135] → [5.2135:2164]

                    Ok(None)

[5.2135]

[5.2164]

                    Err(anyhow::anyhow!(
                        "Unable to retrieve RemoteId for LocalChannel remote"
                    ))

Replacement in pijul/src/remote/mod.rs at line 628 [3.52474]
B:BD[3.73272] → [4.7991:8042]
```
        let id = self.get_id(txn).await?.unwrap();
```
[3.73272]
[3.73272]
```
        let id = self.get_id(txn).await?;
```

Replacement in pijul/src/remote/local.rs at line 41 [3.79745]

B:BD[3.80605] → [4.8610:8700]

    pub fn get_id(&self) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {

[3.80605]

[4.8700]

    pub fn get_id(&self) -> Result<libpijul::pristine::RemoteId, anyhow::Error> {

Replacement in pijul/src/remote/local.rs at line 44 [3.79745]

B:BD[4.8812] → [2.1009:1057]

            Ok(Some(*txn.id(&*channel.read())))

[4.8812]

[4.8869]

            Ok(*txn.id(&*channel.read()))

Replacement in pijul/src/remote/local.rs at line 46 [3.79745]

B:BD[4.8886] → [4.8886:8907]

            Ok(None)

[4.8886]

[4.8907]

            Err(anyhow::anyhow!(
                "Unable to retrieve RemoteId for Local remote"
            ))

Replacement in pijul/src/remote/http.rs at line 295 [7.10]

B:BD[6.1310] → [4.10442:10538]

    pub async fn get_id(&self) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {

[6.1310]

[4.10538]

    pub async fn get_id(&self) -> Result<libpijul::pristine::RemoteId, anyhow::Error> {

Replacement in pijul/src/remote/http.rs at line 311 [7.10]

B:BD[4.11088] → [4.11088:11148]

        Ok(libpijul::pristine::RemoteId::from_bytes(&resp))

[4.11088]

[4.11148]

        libpijul::pristine::RemoteId::from_bytes(&resp)
            .ok_or_else(|| anyhow::anyhow!("Unable to retrieve RemoteId for Http remote"))