Browse Source

Regenerate *.rs files in `src/proto/`

    for new protobuf version 2.17.0
Johannes Hofmann 5 years ago
parent
commit
ac05a602ba
2 changed files with 90 additions and 126 deletions
  1. 8
    16
      src/proto/fileformat.rs
  2. 82
    110
      src/proto/osmformat.rs

+ 8
- 16
src/proto/fileformat.rs View File

1
-// This file is generated by rust-protobuf 2.15.0. Do not edit
1
+// This file is generated by rust-protobuf 2.17.0. Do not edit
2
 // @generated
2
 // @generated
3
 
3
 
4
 // https://github.com/rust-lang/rust-clippy/issues/702
4
 // https://github.com/rust-lang/rust-clippy/issues/702
15
 #![allow(non_snake_case)]
15
 #![allow(non_snake_case)]
16
 #![allow(non_upper_case_globals)]
16
 #![allow(non_upper_case_globals)]
17
 #![allow(trivial_casts)]
17
 #![allow(trivial_casts)]
18
-#![allow(unsafe_code)]
19
 #![allow(unused_imports)]
18
 #![allow(unused_imports)]
20
 #![allow(unused_results)]
19
 #![allow(unused_results)]
21
 //! Generated file from `src/proto/fileformat.proto`
20
 //! Generated file from `src/proto/fileformat.proto`
22
 
21
 
23
-use protobuf::Message as Message_imported_for_functions;
24
-use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
25
-
26
 /// Generated files are compatible only with the same version
22
 /// Generated files are compatible only with the same version
27
 /// of protobuf runtime.
23
 /// of protobuf runtime.
28
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_15_0;
24
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_17_0;
29
 
25
 
30
 #[derive(PartialEq,Clone,Default,Debug)]
26
 #[derive(PartialEq,Clone,Default,Debug)]
31
 pub struct Blob {
27
 pub struct Blob {
313
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
309
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
314
         self as &mut dyn (::std::any::Any)
310
         self as &mut dyn (::std::any::Any)
315
     }
311
     }
316
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
312
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
317
         self
313
         self
318
     }
314
     }
319
 
315
 
326
     }
322
     }
327
 
323
 
328
     fn default_instance() -> &'static Blob {
324
     fn default_instance() -> &'static Blob {
329
-        static mut instance: ::protobuf::lazy::Lazy<Blob> = ::protobuf::lazy::Lazy::INIT;
330
-        unsafe {
331
-            instance.get(Blob::new)
332
-        }
325
+        static instance: ::protobuf::rt::LazyV2<Blob> = ::protobuf::rt::LazyV2::INIT;
326
+        instance.get(Blob::new)
333
     }
327
     }
334
 }
328
 }
335
 
329
 
550
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
544
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
551
         self as &mut dyn (::std::any::Any)
545
         self as &mut dyn (::std::any::Any)
552
     }
546
     }
553
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
547
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
554
         self
548
         self
555
     }
549
     }
556
 
550
 
563
     }
557
     }
564
 
558
 
565
     fn default_instance() -> &'static BlobHeader {
559
     fn default_instance() -> &'static BlobHeader {
566
-        static mut instance: ::protobuf::lazy::Lazy<BlobHeader> = ::protobuf::lazy::Lazy::INIT;
567
-        unsafe {
568
-            instance.get(BlobHeader::new)
569
-        }
560
+        static instance: ::protobuf::rt::LazyV2<BlobHeader> = ::protobuf::rt::LazyV2::INIT;
561
+        instance.get(BlobHeader::new)
570
     }
562
     }
571
 }
563
 }
572
 
564
 

+ 82
- 110
src/proto/osmformat.rs View File

1
-// This file is generated by rust-protobuf 2.15.0. Do not edit
1
+// This file is generated by rust-protobuf 2.17.0. Do not edit
2
 // @generated
2
 // @generated
3
 
3
 
4
 // https://github.com/rust-lang/rust-clippy/issues/702
4
 // https://github.com/rust-lang/rust-clippy/issues/702
15
 #![allow(non_snake_case)]
15
 #![allow(non_snake_case)]
16
 #![allow(non_upper_case_globals)]
16
 #![allow(non_upper_case_globals)]
17
 #![allow(trivial_casts)]
17
 #![allow(trivial_casts)]
18
-#![allow(unsafe_code)]
19
 #![allow(unused_imports)]
18
 #![allow(unused_imports)]
20
 #![allow(unused_results)]
19
 #![allow(unused_results)]
21
 //! Generated file from `src/proto/osmformat.proto`
20
 //! Generated file from `src/proto/osmformat.proto`
22
 
21
 
23
-use protobuf::Message as Message_imported_for_functions;
24
-use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
25
-
26
 /// Generated files are compatible only with the same version
22
 /// Generated files are compatible only with the same version
27
 /// of protobuf runtime.
23
 /// of protobuf runtime.
28
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_15_0;
24
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_17_0;
29
 
25
 
30
 #[derive(PartialEq,Clone,Default,Debug)]
26
 #[derive(PartialEq,Clone,Default,Debug)]
31
 pub struct HeaderBlock {
27
 pub struct HeaderBlock {
32
     // message fields
28
     // message fields
33
-    bbox: ::protobuf::SingularPtrField<HeaderBBox>,
34
-    required_features: ::protobuf::RepeatedField<::std::string::String>,
35
-    optional_features: ::protobuf::RepeatedField<::std::string::String>,
29
+    pub bbox: ::protobuf::SingularPtrField<HeaderBBox>,
30
+    pub required_features: ::protobuf::RepeatedField<::std::string::String>,
31
+    pub optional_features: ::protobuf::RepeatedField<::std::string::String>,
36
     writingprogram: ::protobuf::SingularField<::std::string::String>,
32
     writingprogram: ::protobuf::SingularField<::std::string::String>,
37
     source: ::protobuf::SingularField<::std::string::String>,
33
     source: ::protobuf::SingularField<::std::string::String>,
38
     osmosis_replication_timestamp: ::std::option::Option<i64>,
34
     osmosis_replication_timestamp: ::std::option::Option<i64>,
58
 
54
 
59
 
55
 
60
     pub fn get_bbox(&self) -> &HeaderBBox {
56
     pub fn get_bbox(&self) -> &HeaderBBox {
61
-        self.bbox.as_ref().unwrap_or_else(|| HeaderBBox::default_instance())
57
+        self.bbox.as_ref().unwrap_or_else(|| <HeaderBBox as ::protobuf::Message>::default_instance())
62
     }
58
     }
63
     pub fn clear_bbox(&mut self) {
59
     pub fn clear_bbox(&mut self) {
64
         self.bbox.clear();
60
         self.bbox.clear();
421
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
417
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
422
         self as &mut dyn (::std::any::Any)
418
         self as &mut dyn (::std::any::Any)
423
     }
419
     }
424
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
420
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
425
         self
421
         self
426
     }
422
     }
427
 
423
 
434
     }
430
     }
435
 
431
 
436
     fn default_instance() -> &'static HeaderBlock {
432
     fn default_instance() -> &'static HeaderBlock {
437
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBlock> = ::protobuf::lazy::Lazy::INIT;
438
-        unsafe {
439
-            instance.get(HeaderBlock::new)
440
-        }
433
+        static instance: ::protobuf::rt::LazyV2<HeaderBlock> = ::protobuf::rt::LazyV2::INIT;
434
+        instance.get(HeaderBlock::new)
441
     }
435
     }
442
 }
436
 }
443
 
437
 
674
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
668
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
675
         self as &mut dyn (::std::any::Any)
669
         self as &mut dyn (::std::any::Any)
676
     }
670
     }
677
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
671
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
678
         self
672
         self
679
     }
673
     }
680
 
674
 
687
     }
681
     }
688
 
682
 
689
     fn default_instance() -> &'static HeaderBBox {
683
     fn default_instance() -> &'static HeaderBBox {
690
-        static mut instance: ::protobuf::lazy::Lazy<HeaderBBox> = ::protobuf::lazy::Lazy::INIT;
691
-        unsafe {
692
-            instance.get(HeaderBBox::new)
693
-        }
684
+        static instance: ::protobuf::rt::LazyV2<HeaderBBox> = ::protobuf::rt::LazyV2::INIT;
685
+        instance.get(HeaderBBox::new)
694
     }
686
     }
695
 }
687
 }
696
 
688
 
713
 #[derive(PartialEq,Clone,Default,Debug)]
705
 #[derive(PartialEq,Clone,Default,Debug)]
714
 pub struct PrimitiveBlock {
706
 pub struct PrimitiveBlock {
715
     // message fields
707
     // message fields
716
-    stringtable: ::protobuf::SingularPtrField<StringTable>,
717
-    primitivegroup: ::protobuf::RepeatedField<PrimitiveGroup>,
708
+    pub stringtable: ::protobuf::SingularPtrField<StringTable>,
709
+    pub primitivegroup: ::protobuf::RepeatedField<PrimitiveGroup>,
718
     granularity: ::std::option::Option<i32>,
710
     granularity: ::std::option::Option<i32>,
719
     lat_offset: ::std::option::Option<i64>,
711
     lat_offset: ::std::option::Option<i64>,
720
     lon_offset: ::std::option::Option<i64>,
712
     lon_offset: ::std::option::Option<i64>,
739
 
731
 
740
 
732
 
741
     pub fn get_stringtable(&self) -> &StringTable {
733
     pub fn get_stringtable(&self) -> &StringTable {
742
-        self.stringtable.as_ref().unwrap_or_else(|| StringTable::default_instance())
734
+        self.stringtable.as_ref().unwrap_or_else(|| <StringTable as ::protobuf::Message>::default_instance())
743
     }
735
     }
744
     pub fn clear_stringtable(&mut self) {
736
     pub fn clear_stringtable(&mut self) {
745
         self.stringtable.clear();
737
         self.stringtable.clear();
1008
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1000
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1009
         self as &mut dyn (::std::any::Any)
1001
         self as &mut dyn (::std::any::Any)
1010
     }
1002
     }
1011
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1003
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1012
         self
1004
         self
1013
     }
1005
     }
1014
 
1006
 
1021
     }
1013
     }
1022
 
1014
 
1023
     fn default_instance() -> &'static PrimitiveBlock {
1015
     fn default_instance() -> &'static PrimitiveBlock {
1024
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveBlock> = ::protobuf::lazy::Lazy::INIT;
1025
-        unsafe {
1026
-            instance.get(PrimitiveBlock::new)
1027
-        }
1016
+        static instance: ::protobuf::rt::LazyV2<PrimitiveBlock> = ::protobuf::rt::LazyV2::INIT;
1017
+        instance.get(PrimitiveBlock::new)
1028
     }
1018
     }
1029
 }
1019
 }
1030
 
1020
 
1049
 #[derive(PartialEq,Clone,Default,Debug)]
1039
 #[derive(PartialEq,Clone,Default,Debug)]
1050
 pub struct PrimitiveGroup {
1040
 pub struct PrimitiveGroup {
1051
     // message fields
1041
     // message fields
1052
-    nodes: ::protobuf::RepeatedField<Node>,
1053
-    dense: ::protobuf::SingularPtrField<DenseNodes>,
1054
-    ways: ::protobuf::RepeatedField<Way>,
1055
-    relations: ::protobuf::RepeatedField<Relation>,
1056
-    changesets: ::protobuf::RepeatedField<ChangeSet>,
1042
+    pub nodes: ::protobuf::RepeatedField<Node>,
1043
+    pub dense: ::protobuf::SingularPtrField<DenseNodes>,
1044
+    pub ways: ::protobuf::RepeatedField<Way>,
1045
+    pub relations: ::protobuf::RepeatedField<Relation>,
1046
+    pub changesets: ::protobuf::RepeatedField<ChangeSet>,
1057
     // special fields
1047
     // special fields
1058
     pub unknown_fields: ::protobuf::UnknownFields,
1048
     pub unknown_fields: ::protobuf::UnknownFields,
1059
     pub cached_size: ::protobuf::CachedSize,
1049
     pub cached_size: ::protobuf::CachedSize,
1099
 
1089
 
1100
 
1090
 
1101
     pub fn get_dense(&self) -> &DenseNodes {
1091
     pub fn get_dense(&self) -> &DenseNodes {
1102
-        self.dense.as_ref().unwrap_or_else(|| DenseNodes::default_instance())
1092
+        self.dense.as_ref().unwrap_or_else(|| <DenseNodes as ::protobuf::Message>::default_instance())
1103
     }
1093
     }
1104
     pub fn clear_dense(&mut self) {
1094
     pub fn clear_dense(&mut self) {
1105
         self.dense.clear();
1095
         self.dense.clear();
1338
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1328
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1339
         self as &mut dyn (::std::any::Any)
1329
         self as &mut dyn (::std::any::Any)
1340
     }
1330
     }
1341
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1331
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1342
         self
1332
         self
1343
     }
1333
     }
1344
 
1334
 
1351
     }
1341
     }
1352
 
1342
 
1353
     fn default_instance() -> &'static PrimitiveGroup {
1343
     fn default_instance() -> &'static PrimitiveGroup {
1354
-        static mut instance: ::protobuf::lazy::Lazy<PrimitiveGroup> = ::protobuf::lazy::Lazy::INIT;
1355
-        unsafe {
1356
-            instance.get(PrimitiveGroup::new)
1357
-        }
1344
+        static instance: ::protobuf::rt::LazyV2<PrimitiveGroup> = ::protobuf::rt::LazyV2::INIT;
1345
+        instance.get(PrimitiveGroup::new)
1358
     }
1346
     }
1359
 }
1347
 }
1360
 
1348
 
1378
 #[derive(PartialEq,Clone,Default,Debug)]
1366
 #[derive(PartialEq,Clone,Default,Debug)]
1379
 pub struct StringTable {
1367
 pub struct StringTable {
1380
     // message fields
1368
     // message fields
1381
-    s: ::protobuf::RepeatedField<::std::vec::Vec<u8>>,
1369
+    pub s: ::protobuf::RepeatedField<::std::vec::Vec<u8>>,
1382
     // special fields
1370
     // special fields
1383
     pub unknown_fields: ::protobuf::UnknownFields,
1371
     pub unknown_fields: ::protobuf::UnknownFields,
1384
     pub cached_size: ::protobuf::CachedSize,
1372
     pub cached_size: ::protobuf::CachedSize,
1479
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1467
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1480
         self as &mut dyn (::std::any::Any)
1468
         self as &mut dyn (::std::any::Any)
1481
     }
1469
     }
1482
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1470
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1483
         self
1471
         self
1484
     }
1472
     }
1485
 
1473
 
1492
     }
1480
     }
1493
 
1481
 
1494
     fn default_instance() -> &'static StringTable {
1482
     fn default_instance() -> &'static StringTable {
1495
-        static mut instance: ::protobuf::lazy::Lazy<StringTable> = ::protobuf::lazy::Lazy::INIT;
1496
-        unsafe {
1497
-            instance.get(StringTable::new)
1498
-        }
1483
+        static instance: ::protobuf::rt::LazyV2<StringTable> = ::protobuf::rt::LazyV2::INIT;
1484
+        instance.get(StringTable::new)
1499
     }
1485
     }
1500
 }
1486
 }
1501
 
1487
 
1779
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1765
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
1780
         self as &mut dyn (::std::any::Any)
1766
         self as &mut dyn (::std::any::Any)
1781
     }
1767
     }
1782
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1768
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
1783
         self
1769
         self
1784
     }
1770
     }
1785
 
1771
 
1792
     }
1778
     }
1793
 
1779
 
1794
     fn default_instance() -> &'static Info {
1780
     fn default_instance() -> &'static Info {
1795
-        static mut instance: ::protobuf::lazy::Lazy<Info> = ::protobuf::lazy::Lazy::INIT;
1796
-        unsafe {
1797
-            instance.get(Info::new)
1798
-        }
1781
+        static instance: ::protobuf::rt::LazyV2<Info> = ::protobuf::rt::LazyV2::INIT;
1782
+        instance.get(Info::new)
1799
     }
1783
     }
1800
 }
1784
 }
1801
 
1785
 
1820
 #[derive(PartialEq,Clone,Default,Debug)]
1804
 #[derive(PartialEq,Clone,Default,Debug)]
1821
 pub struct DenseInfo {
1805
 pub struct DenseInfo {
1822
     // message fields
1806
     // message fields
1823
-    version: ::std::vec::Vec<i32>,
1824
-    timestamp: ::std::vec::Vec<i64>,
1825
-    changeset: ::std::vec::Vec<i64>,
1826
-    uid: ::std::vec::Vec<i32>,
1827
-    user_sid: ::std::vec::Vec<i32>,
1828
-    visible: ::std::vec::Vec<bool>,
1807
+    pub version: ::std::vec::Vec<i32>,
1808
+    pub timestamp: ::std::vec::Vec<i64>,
1809
+    pub changeset: ::std::vec::Vec<i64>,
1810
+    pub uid: ::std::vec::Vec<i32>,
1811
+    pub user_sid: ::std::vec::Vec<i32>,
1812
+    pub visible: ::std::vec::Vec<bool>,
1829
     // special fields
1813
     // special fields
1830
     pub unknown_fields: ::protobuf::UnknownFields,
1814
     pub unknown_fields: ::protobuf::UnknownFields,
1831
     pub cached_size: ::protobuf::CachedSize,
1815
     pub cached_size: ::protobuf::CachedSize,
2126
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2110
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2127
         self as &mut dyn (::std::any::Any)
2111
         self as &mut dyn (::std::any::Any)
2128
     }
2112
     }
2129
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2113
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2130
         self
2114
         self
2131
     }
2115
     }
2132
 
2116
 
2139
     }
2123
     }
2140
 
2124
 
2141
     fn default_instance() -> &'static DenseInfo {
2125
     fn default_instance() -> &'static DenseInfo {
2142
-        static mut instance: ::protobuf::lazy::Lazy<DenseInfo> = ::protobuf::lazy::Lazy::INIT;
2143
-        unsafe {
2144
-            instance.get(DenseInfo::new)
2145
-        }
2126
+        static instance: ::protobuf::rt::LazyV2<DenseInfo> = ::protobuf::rt::LazyV2::INIT;
2127
+        instance.get(DenseInfo::new)
2146
     }
2128
     }
2147
 }
2129
 }
2148
 
2130
 
2269
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2251
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2270
         self as &mut dyn (::std::any::Any)
2252
         self as &mut dyn (::std::any::Any)
2271
     }
2253
     }
2272
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2254
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2273
         self
2255
         self
2274
     }
2256
     }
2275
 
2257
 
2282
     }
2264
     }
2283
 
2265
 
2284
     fn default_instance() -> &'static ChangeSet {
2266
     fn default_instance() -> &'static ChangeSet {
2285
-        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy::INIT;
2286
-        unsafe {
2287
-            instance.get(ChangeSet::new)
2288
-        }
2267
+        static instance: ::protobuf::rt::LazyV2<ChangeSet> = ::protobuf::rt::LazyV2::INIT;
2268
+        instance.get(ChangeSet::new)
2289
     }
2269
     }
2290
 }
2270
 }
2291
 
2271
 
2306
 pub struct Node {
2286
 pub struct Node {
2307
     // message fields
2287
     // message fields
2308
     id: ::std::option::Option<i64>,
2288
     id: ::std::option::Option<i64>,
2309
-    keys: ::std::vec::Vec<u32>,
2310
-    vals: ::std::vec::Vec<u32>,
2311
-    info: ::protobuf::SingularPtrField<Info>,
2289
+    pub keys: ::std::vec::Vec<u32>,
2290
+    pub vals: ::std::vec::Vec<u32>,
2291
+    pub info: ::protobuf::SingularPtrField<Info>,
2312
     lat: ::std::option::Option<i64>,
2292
     lat: ::std::option::Option<i64>,
2313
     lon: ::std::option::Option<i64>,
2293
     lon: ::std::option::Option<i64>,
2314
     // special fields
2294
     // special fields
2400
 
2380
 
2401
 
2381
 
2402
     pub fn get_info(&self) -> &Info {
2382
     pub fn get_info(&self) -> &Info {
2403
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
2383
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
2404
     }
2384
     }
2405
     pub fn clear_info(&mut self) {
2385
     pub fn clear_info(&mut self) {
2406
         self.info.clear();
2386
         self.info.clear();
2610
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2590
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2611
         self as &mut dyn (::std::any::Any)
2591
         self as &mut dyn (::std::any::Any)
2612
     }
2592
     }
2613
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2593
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2614
         self
2594
         self
2615
     }
2595
     }
2616
 
2596
 
2623
     }
2603
     }
2624
 
2604
 
2625
     fn default_instance() -> &'static Node {
2605
     fn default_instance() -> &'static Node {
2626
-        static mut instance: ::protobuf::lazy::Lazy<Node> = ::protobuf::lazy::Lazy::INIT;
2627
-        unsafe {
2628
-            instance.get(Node::new)
2629
-        }
2606
+        static instance: ::protobuf::rt::LazyV2<Node> = ::protobuf::rt::LazyV2::INIT;
2607
+        instance.get(Node::new)
2630
     }
2608
     }
2631
 }
2609
 }
2632
 
2610
 
2651
 #[derive(PartialEq,Clone,Default,Debug)]
2629
 #[derive(PartialEq,Clone,Default,Debug)]
2652
 pub struct DenseNodes {
2630
 pub struct DenseNodes {
2653
     // message fields
2631
     // message fields
2654
-    id: ::std::vec::Vec<i64>,
2655
-    denseinfo: ::protobuf::SingularPtrField<DenseInfo>,
2656
-    lat: ::std::vec::Vec<i64>,
2657
-    lon: ::std::vec::Vec<i64>,
2658
-    keys_vals: ::std::vec::Vec<i32>,
2632
+    pub id: ::std::vec::Vec<i64>,
2633
+    pub denseinfo: ::protobuf::SingularPtrField<DenseInfo>,
2634
+    pub lat: ::std::vec::Vec<i64>,
2635
+    pub lon: ::std::vec::Vec<i64>,
2636
+    pub keys_vals: ::std::vec::Vec<i32>,
2659
     // special fields
2637
     // special fields
2660
     pub unknown_fields: ::protobuf::UnknownFields,
2638
     pub unknown_fields: ::protobuf::UnknownFields,
2661
     pub cached_size: ::protobuf::CachedSize,
2639
     pub cached_size: ::protobuf::CachedSize,
2701
 
2679
 
2702
 
2680
 
2703
     pub fn get_denseinfo(&self) -> &DenseInfo {
2681
     pub fn get_denseinfo(&self) -> &DenseInfo {
2704
-        self.denseinfo.as_ref().unwrap_or_else(|| DenseInfo::default_instance())
2682
+        self.denseinfo.as_ref().unwrap_or_else(|| <DenseInfo as ::protobuf::Message>::default_instance())
2705
     }
2683
     }
2706
     pub fn clear_denseinfo(&mut self) {
2684
     pub fn clear_denseinfo(&mut self) {
2707
         self.denseinfo.clear();
2685
         self.denseinfo.clear();
2928
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2906
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
2929
         self as &mut dyn (::std::any::Any)
2907
         self as &mut dyn (::std::any::Any)
2930
     }
2908
     }
2931
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2909
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
2932
         self
2910
         self
2933
     }
2911
     }
2934
 
2912
 
2941
     }
2919
     }
2942
 
2920
 
2943
     fn default_instance() -> &'static DenseNodes {
2921
     fn default_instance() -> &'static DenseNodes {
2944
-        static mut instance: ::protobuf::lazy::Lazy<DenseNodes> = ::protobuf::lazy::Lazy::INIT;
2945
-        unsafe {
2946
-            instance.get(DenseNodes::new)
2947
-        }
2922
+        static instance: ::protobuf::rt::LazyV2<DenseNodes> = ::protobuf::rt::LazyV2::INIT;
2923
+        instance.get(DenseNodes::new)
2948
     }
2924
     }
2949
 }
2925
 }
2950
 
2926
 
2969
 pub struct Way {
2945
 pub struct Way {
2970
     // message fields
2946
     // message fields
2971
     id: ::std::option::Option<i64>,
2947
     id: ::std::option::Option<i64>,
2972
-    keys: ::std::vec::Vec<u32>,
2973
-    vals: ::std::vec::Vec<u32>,
2974
-    info: ::protobuf::SingularPtrField<Info>,
2975
-    refs: ::std::vec::Vec<i64>,
2948
+    pub keys: ::std::vec::Vec<u32>,
2949
+    pub vals: ::std::vec::Vec<u32>,
2950
+    pub info: ::protobuf::SingularPtrField<Info>,
2951
+    pub refs: ::std::vec::Vec<i64>,
2976
     // special fields
2952
     // special fields
2977
     pub unknown_fields: ::protobuf::UnknownFields,
2953
     pub unknown_fields: ::protobuf::UnknownFields,
2978
     pub cached_size: ::protobuf::CachedSize,
2954
     pub cached_size: ::protobuf::CachedSize,
3062
 
3038
 
3063
 
3039
 
3064
     pub fn get_info(&self) -> &Info {
3040
     pub fn get_info(&self) -> &Info {
3065
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
3041
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
3066
     }
3042
     }
3067
     pub fn clear_info(&mut self) {
3043
     pub fn clear_info(&mut self) {
3068
         self.info.clear();
3044
         self.info.clear();
3241
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
3217
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
3242
         self as &mut dyn (::std::any::Any)
3218
         self as &mut dyn (::std::any::Any)
3243
     }
3219
     }
3244
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
3220
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
3245
         self
3221
         self
3246
     }
3222
     }
3247
 
3223
 
3254
     }
3230
     }
3255
 
3231
 
3256
     fn default_instance() -> &'static Way {
3232
     fn default_instance() -> &'static Way {
3257
-        static mut instance: ::protobuf::lazy::Lazy<Way> = ::protobuf::lazy::Lazy::INIT;
3258
-        unsafe {
3259
-            instance.get(Way::new)
3260
-        }
3233
+        static instance: ::protobuf::rt::LazyV2<Way> = ::protobuf::rt::LazyV2::INIT;
3234
+        instance.get(Way::new)
3261
     }
3235
     }
3262
 }
3236
 }
3263
 
3237
 
3282
 pub struct Relation {
3256
 pub struct Relation {
3283
     // message fields
3257
     // message fields
3284
     id: ::std::option::Option<i64>,
3258
     id: ::std::option::Option<i64>,
3285
-    keys: ::std::vec::Vec<u32>,
3286
-    vals: ::std::vec::Vec<u32>,
3287
-    info: ::protobuf::SingularPtrField<Info>,
3288
-    roles_sid: ::std::vec::Vec<i32>,
3289
-    memids: ::std::vec::Vec<i64>,
3290
-    types: ::std::vec::Vec<Relation_MemberType>,
3259
+    pub keys: ::std::vec::Vec<u32>,
3260
+    pub vals: ::std::vec::Vec<u32>,
3261
+    pub info: ::protobuf::SingularPtrField<Info>,
3262
+    pub roles_sid: ::std::vec::Vec<i32>,
3263
+    pub memids: ::std::vec::Vec<i64>,
3264
+    pub types: ::std::vec::Vec<Relation_MemberType>,
3291
     // special fields
3265
     // special fields
3292
     pub unknown_fields: ::protobuf::UnknownFields,
3266
     pub unknown_fields: ::protobuf::UnknownFields,
3293
     pub cached_size: ::protobuf::CachedSize,
3267
     pub cached_size: ::protobuf::CachedSize,
3377
 
3351
 
3378
 
3352
 
3379
     pub fn get_info(&self) -> &Info {
3353
     pub fn get_info(&self) -> &Info {
3380
-        self.info.as_ref().unwrap_or_else(|| Info::default_instance())
3354
+        self.info.as_ref().unwrap_or_else(|| <Info as ::protobuf::Message>::default_instance())
3381
     }
3355
     }
3382
     pub fn clear_info(&mut self) {
3356
     pub fn clear_info(&mut self) {
3383
         self.info.clear();
3357
         self.info.clear();
3609
             // TODO: Data size is computed again, it should be cached
3583
             // TODO: Data size is computed again, it should be cached
3610
             os.write_raw_varint32(::protobuf::rt::vec_packed_enum_data_size(&self.types))?;
3584
             os.write_raw_varint32(::protobuf::rt::vec_packed_enum_data_size(&self.types))?;
3611
             for v in &self.types {
3585
             for v in &self.types {
3612
-                os.write_enum_no_tag(v.value())?;
3586
+                os.write_enum_no_tag(::protobuf::ProtobufEnum::value(v))?;
3613
             };
3587
             };
3614
         }
3588
         }
3615
         os.write_unknown_fields(self.get_unknown_fields())?;
3589
         os.write_unknown_fields(self.get_unknown_fields())?;
3634
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
3608
     fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) {
3635
         self as &mut dyn (::std::any::Any)
3609
         self as &mut dyn (::std::any::Any)
3636
     }
3610
     }
3637
-    fn into_any(self: Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
3611
+    fn into_any(self: ::std::boxed::Box<Self>) -> ::std::boxed::Box<dyn (::std::any::Any)> {
3638
         self
3612
         self
3639
     }
3613
     }
3640
 
3614
 
3647
     }
3621
     }
3648
 
3622
 
3649
     fn default_instance() -> &'static Relation {
3623
     fn default_instance() -> &'static Relation {
3650
-        static mut instance: ::protobuf::lazy::Lazy<Relation> = ::protobuf::lazy::Lazy::INIT;
3651
-        unsafe {
3652
-            instance.get(Relation::new)
3653
-        }
3624
+        static instance: ::protobuf::rt::LazyV2<Relation> = ::protobuf::rt::LazyV2::INIT;
3625
+        instance.get(Relation::new)
3654
     }
3626
     }
3655
 }
3627
 }
3656
 
3628
 
3715
 
3687
 
3716
 impl ::protobuf::reflect::ProtobufValue for Relation_MemberType {
3688
 impl ::protobuf::reflect::ProtobufValue for Relation_MemberType {
3717
     fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
3689
     fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
3718
-        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
3690
+        ::protobuf::reflect::ReflectValueRef::Enum(::protobuf::ProtobufEnum::descriptor(self))
3719
     }
3691
     }
3720
 }
3692
 }