Procházet zdrojové kódy

Fix some clippy warnings

Johannes Hofmann před 8 roky
rodič
revize
2f005a415c
2 změnil soubory, kde provedl 10 přidání a 9 odebrání
  1. 6
    5
      src/blob.rs
  2. 4
    4
      src/mmap_blob.rs

+ 6
- 5
src/blob.rs Zobrazit soubor

35
 /// The decoded content of a blob (analogous to `BlobType`).
35
 /// The decoded content of a blob (analogous to `BlobType`).
36
 pub enum BlobDecode<'a> {
36
 pub enum BlobDecode<'a> {
37
     /// Blob contains a `HeaderBlock`.
37
     /// Blob contains a `HeaderBlock`.
38
-    OsmHeader(HeaderBlock),
38
+    OsmHeader(Box<HeaderBlock>),
39
     /// Blob contains a `PrimitiveBlock`.
39
     /// Blob contains a `PrimitiveBlock`.
40
     OsmData(PrimitiveBlock),
40
     OsmData(PrimitiveBlock),
41
     /// An unknown blob type with the given string identifier.
41
     /// An unknown blob type with the given string identifier.
65
     pub fn decode(&self) -> Result<BlobDecode> {
65
     pub fn decode(&self) -> Result<BlobDecode> {
66
         match self.get_type() {
66
         match self.get_type() {
67
             BlobType::OsmHeader => {
67
             BlobType::OsmHeader => {
68
-                self.to_headerblock()
69
-                    .map(BlobDecode::OsmHeader)
68
+                let block = Box::new(self.to_headerblock()?);
69
+                Ok(BlobDecode::OsmHeader(block))
70
+
70
             },
71
             },
71
             BlobType::OsmData => {
72
             BlobType::OsmData => {
72
-                self.to_primitiveblock()
73
-                    .map(BlobDecode::OsmData)
73
+                let block = self.to_primitiveblock()?;
74
+                Ok(BlobDecode::OsmData(block))
74
             },
75
             },
75
             BlobType::Unknown(x) => Ok(BlobDecode::Unknown(x)),
76
             BlobType::Unknown(x) => Ok(BlobDecode::Unknown(x)),
76
         }
77
         }

+ 4
- 4
src/mmap_blob.rs Zobrazit soubor

89
             .chain_err(|| "failed to parse Blob")?;
89
             .chain_err(|| "failed to parse Blob")?;
90
         match self.header.get_field_type() {
90
         match self.header.get_field_type() {
91
             "OSMHeader" => {
91
             "OSMHeader" => {
92
-                let block: osmformat::HeaderBlock = decode_blob(&blob).unwrap();
93
-                Ok(BlobDecode::OsmHeader(HeaderBlock::new(block)))
92
+                let block = Box::new(HeaderBlock::new(decode_blob(&blob)?));
93
+                Ok(BlobDecode::OsmHeader(block))
94
             }
94
             }
95
             "OSMData" => {
95
             "OSMData" => {
96
-                let block: osmformat::PrimitiveBlock = decode_blob(&blob).unwrap();
96
+                let block: osmformat::PrimitiveBlock = decode_blob(&blob)?;
97
                 Ok(BlobDecode::OsmData(PrimitiveBlock::new(block)))
97
                 Ok(BlobDecode::OsmData(PrimitiveBlock::new(block)))
98
             }
98
             }
99
             x => Ok(BlobDecode::Unknown(x)),
99
             x => Ok(BlobDecode::Unknown(x)),
174
             Ok(x) => x,
174
             Ok(x) => x,
175
             Err(e) => {
175
             Err(e) => {
176
                 self.last_blob_ok = false;
176
                 self.last_blob_ok = false;
177
-                return Some(Err(e.into()));
177
+                return Some(Err(e));
178
             },
178
             },
179
         };
179
         };
180
 
180