Browse Source

Run cargo fmt

Johannes Hofmann 5 years ago
parent
commit
6f290a6041
4 changed files with 27 additions and 29 deletions
  1. 2
    2
      examples/indexed.rs
  2. 1
    4
      src/blob.rs
  3. 7
    8
      src/indexed.rs
  4. 17
    15
      tests/read.rs

+ 2
- 2
examples/indexed.rs View File

3
 
3
 
4
 extern crate osmpbf;
4
 extern crate osmpbf;
5
 
5
 
6
-use osmpbf::{IndexedReader, Element};
6
+use osmpbf::{Element, IndexedReader};
7
 use std::error::Error;
7
 use std::error::Error;
8
 
8
 
9
 fn main() -> Result<(), Box<dyn Error>> {
9
 fn main() -> Result<(), Box<dyn Error>> {
28
                 Element::Way(_way) => ways += 1,
28
                 Element::Way(_way) => ways += 1,
29
                 Element::Node(_node) => nodes += 1,
29
                 Element::Node(_node) => nodes += 1,
30
                 Element::DenseNode(_dense_node) => nodes += 1,
30
                 Element::DenseNode(_dense_node) => nodes += 1,
31
-                Element::Relation(_) => {}, // should not occur
31
+                Element::Relation(_) => {} // should not occur
32
             }
32
             }
33
         },
33
         },
34
     )?;
34
     )?;

+ 1
- 4
src/blob.rs View File

149
     }
149
     }
150
 }
150
 }
151
 
151
 
152
-
153
 /// A reader for PBF files that allows iterating over `Blob`s.
152
 /// A reader for PBF files that allows iterating over `Blob`s.
154
 #[derive(Clone, Debug)]
153
 #[derive(Clone, Debug)]
155
 pub struct BlobReader<R: Read + Send> {
154
 pub struct BlobReader<R: Read + Send> {
222
                 }
221
                 }
223
             };
222
             };
224
 
223
 
225
-        self.offset = self
226
-            .offset
227
-            .map(|x| ByteOffset(x.0 + header_size));
224
+        self.offset = self.offset.map(|x| ByteOffset(x.0 + header_size));
228
 
225
 
229
         Some(Ok(header))
226
         Some(Ok(header))
230
     }
227
     }

+ 7
- 8
src/indexed.rs View File

129
     /// # }
129
     /// # }
130
     /// # foo().unwrap();
130
     /// # foo().unwrap();
131
     /// ```
131
     /// ```
132
-    pub fn read_ways_and_deps<F, E>(
133
-        &mut self,
134
-        mut filter: F,
135
-        mut element_callback: E,
136
-    ) -> Result<()>
132
+    pub fn read_ways_and_deps<F, E>(&mut self, mut filter: F, mut element_callback: E) -> Result<()>
137
     where
133
     where
138
         F: for<'a> FnMut(&Way<'a>) -> bool,
134
         F: for<'a> FnMut(&Way<'a>) -> bool,
139
         E: for<'a> FnMut(&Element<'a>),
135
         E: for<'a> FnMut(&Element<'a>),
202
         //   * Iterate only over blobs that may include the node IDs we're searching for
198
         //   * Iterate only over blobs that may include the node IDs we're searching for
203
         for info in &mut self.index {
199
         for info in &mut self.index {
204
             if info.blob_type == SimpleBlobType::Primitive {
200
             if info.blob_type == SimpleBlobType::Primitive {
205
-                if let Some(node_id_range) = info.id_ranges.as_ref().and_then(|r| r.node_ids.as_ref()) {
201
+                if let Some(node_id_range) =
202
+                    info.id_ranges.as_ref().and_then(|r| r.node_ids.as_ref())
203
+                {
206
                     if range_included(node_id_range.clone(), &node_ids) {
204
                     if range_included(node_id_range.clone(), &node_ids) {
207
                         //TODO Only collect into Vec if range has a reasonable size
205
                         //TODO Only collect into Vec if range has a reasonable size
208
-                        let node_ids: Vec<i64> = node_ids.range(node_id_range.clone()).copied().collect();
206
+                        let node_ids: Vec<i64> =
207
+                            node_ids.range(node_id_range.clone()).copied().collect();
209
                         self.reader.seek(info.offset)?;
208
                         self.reader.seek(info.offset)?;
210
                         let blob = self.reader.next().ok_or_else(|| {
209
                         let blob = self.reader.next().ok_or_else(|| {
211
                             ::std::io::Error::new(
210
                             ::std::io::Error::new(
265
     #[test]
264
     #[test]
266
     fn test_range_included_set() {
265
     fn test_range_included_set() {
267
         let mut set = BTreeSet::<i64>::new();
266
         let mut set = BTreeSet::<i64>::new();
268
-        set.extend(&[1,2,6]);
267
+        set.extend(&[1, 2, 6]);
269
 
268
 
270
         assert_eq!(range_included(RangeInclusive::new(0, 0), &set), false);
269
         assert_eq!(range_included(RangeInclusive::new(0, 0), &set), false);
271
         assert_eq!(range_included(RangeInclusive::new(1, 1), &set), true);
270
         assert_eq!(range_included(RangeInclusive::new(1, 1), &set), true);

+ 17
- 15
tests/read.rs View File

207
         let mut ways = 0;
207
         let mut ways = 0;
208
         let mut nodes = 0;
208
         let mut nodes = 0;
209
 
209
 
210
-        reader.read_ways_and_deps(
211
-            |way| {
212
-                way.tags()
213
-                   .find(|&key_value| key_value == ("building", "yes"))
214
-                   .is_some()
215
-            },
216
-            |element| {
217
-                match element {
218
-                    Element::Way(_) => ways += 1,
219
-                    Element::Node(_) => nodes += 1,
220
-                    Element::DenseNode(_) => nodes += 1,
221
-                    Element::Relation(_) => panic!(), // should not occur
222
-                }
223
-            },
224
-        ).unwrap();
210
+        reader
211
+            .read_ways_and_deps(
212
+                |way| {
213
+                    way.tags()
214
+                        .find(|&key_value| key_value == ("building", "yes"))
215
+                        .is_some()
216
+                },
217
+                |element| {
218
+                    match element {
219
+                        Element::Way(_) => ways += 1,
220
+                        Element::Node(_) => nodes += 1,
221
+                        Element::DenseNode(_) => nodes += 1,
222
+                        Element::Relation(_) => panic!(), // should not occur
223
+                    }
224
+                },
225
+            )
226
+            .unwrap();
225
 
227
 
226
         assert_eq!(ways, 1);
228
         assert_eq!(ways, 1);
227
         assert_eq!(nodes, 3);
229
         assert_eq!(nodes, 3);