RsBundle  Diff

Differences From Artifact [cf47681fdb]:

  • File src/solver/sync.rs — part of check-in [c2738cdf86] at 2022-04-09 16:46:43 on branch trunk — Make error handling compatible with `anyhow` (user: fifr size: 30661)

To Artifact [abf155d1fb]:

  • File src/solver/sync.rs — part of check-in [7203cfd9bb] at 2022-04-09 18:12:45 on branch garbage — Add `AsDynError` trait from `thiserror` (user: fifr size: 30653)

25
26
27
28
29
30
31
32

33
34
35
36
37
38
39
25
26
27
28
29
30
31

32
33
34
35
36
37
38
39







-
+







use log::{debug, info, warn};
use num_traits::{Float, Zero};
use std::fmt::{self, Debug, Display};
use std::sync::Arc;
use std::time::Instant;
use threadpool::ThreadPool;

use crate::{DVector, Minorant, Real};
use crate::{AsDynError, DVector, Minorant, Real};

use super::channels::{
    ChannelResultSender, ChannelUpdateSender, ClientReceiver, ClientSender, EvalResult, Message, Update,
};
use super::masterprocess::{MasterConfig, MasterError, MasterProcess, MasterResponse, Response};
use crate::master::{Builder as MasterBuilder, MasterProblem};
use crate::problem::{FirstOrderProblem, UpdateState};
73
74
75
76
77
78
79
80
81


82
83
84
85
86

87
88
89


90
91
92
93
94
95
96
73
74
75
76
77
78
79


80
81
82
83
84
85

86
87


88
89
90
91
92
93
94
95
96







-
-
+
+




-
+

-
-
+
+







    NotInitialized,
    // Problem has not been solved, yet.
    NotSolved,
}

impl<PErr, MErr> std::error::Error for Error<PErr, MErr>
where
    PErr: Debug + Display + AsRef<dyn std::error::Error + 'static> + 'static,
    MErr: Debug + Display + AsRef<dyn std::error::Error + 'static> + 'static,
    PErr: Debug + Display + AsDynError<'static> + 'static,
    MErr: Debug + Display + AsDynError<'static> + 'static,
{
    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
        use Error::*;
        match self {
            BuildMaster(err) => Some(err.as_ref()),
            BuildMaster(err) => Some(err.as_dyn_error()),
            Master(err) => Some(err),
            Evaluation(err) => Some(err.as_ref()),
            Update(err) => Some(err.as_ref()),
            Evaluation(err) => Some(err.as_dyn_error()),
            Update(err) => Some(err.as_dyn_error()),
            DisconnectedReceiver(err) => Some(err),
            _ => None,
        }
    }
}

impl<PErr, MErr> Display for Error<PErr, MErr>