diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-15 13:58:15 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-15 14:06:34 +0100 |
| commit | eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (patch) | |
| tree | 84f6746ec92ca3a5344da22edadcd1ac3413aa29 /src/model/helper | |
| parent | cf2af186fcc0c8f581a966454b6cd4720d3821f0 (diff) | |
| parent | 7be3f15e45fcfff10a45302a040c2919a3ba8ccd (diff) | |
| download | garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.tar.gz garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/model/helper')
| -rw-r--r-- | src/model/helper/error.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/model/helper/error.rs b/src/model/helper/error.rs index 3ca8f55c..e2ffdd68 100644 --- a/src/model/helper/error.rs +++ b/src/model/helper/error.rs @@ -22,9 +22,9 @@ pub enum Error { NoSuchBucket(String), } -impl From<netapp::error::Error> for Error { - fn from(e: netapp::error::Error) -> Self { - Error::Internal(GarageError::Netapp(e)) +impl From<garage_net::error::Error> for Error { + fn from(e: garage_net::error::Error) -> Self { + Error::Internal(GarageError::Net(e)) } } |