Skip to content

Commit d6e8b4c

Browse files
committed
Clean up public exports
Instead of `pub use foo::*`, we should be explicitly define our public types. Signed-off-by: Gris Ge <fge@redhat.com>
1 parent 9be24c6 commit d6e8b4c

File tree

7 files changed

+92
-93
lines changed

7 files changed

+92
-93
lines changed

src/addr/mod.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
63
mod add;
7-
pub use self::add::*;
8-
94
mod del;
10-
pub use self::del::*;
11-
125
mod get;
13-
pub use self::get::*;
6+
mod handle;
7+
8+
pub use self::add::AddressAddRequest;
9+
pub use self::del::AddressDelRequest;
10+
pub use self::get::AddressGetRequest;
11+
pub use self::handle::AddressHandle;

src/lib.rs

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,51 @@ pub use netlink_packet_utils as packet_utils;
1111
pub use netlink_proto as proto;
1212
pub use netlink_sys as sys;
1313

14+
mod addr;
15+
mod connection;
16+
pub mod constants;
17+
mod errors;
1418
mod handle;
15-
pub use crate::handle::*;
16-
19+
mod link;
20+
mod macros;
21+
mod neighbour;
1722
#[cfg(not(target_os = "freebsd"))]
1823
mod ns;
19-
#[cfg(not(target_os = "freebsd"))]
20-
pub use crate::ns::*;
21-
22-
mod errors;
23-
pub use crate::errors::*;
24-
25-
mod link;
26-
pub use crate::link::*;
27-
28-
mod addr;
29-
pub use crate::addr::*;
30-
3124
mod route;
32-
pub use crate::route::*;
33-
3425
mod rule;
35-
pub use crate::rule::*;
36-
37-
mod connection;
38-
pub use crate::connection::*;
39-
4026
#[cfg(not(target_os = "freebsd"))]
4127
mod traffic_control;
42-
#[cfg(not(target_os = "freebsd"))]
43-
pub use crate::traffic_control::*;
4428

45-
mod neighbour;
46-
pub use crate::neighbour::*;
47-
48-
pub mod constants;
49-
50-
mod macros;
29+
pub use crate::addr::{
30+
AddressAddRequest, AddressDelRequest, AddressGetRequest, AddressHandle,
31+
};
32+
#[cfg(feature = "tokio_socket")]
33+
pub use crate::connection::new_connection;
34+
pub use crate::connection::new_connection_with_socket;
35+
pub use crate::errors::Error;
36+
pub use crate::handle::Handle;
37+
pub use crate::link::{
38+
BondAddRequest, BondPortSetRequest, LinkAddRequest, LinkDelPropRequest,
39+
LinkDelRequest, LinkGetRequest, LinkHandle, LinkNewPropRequest,
40+
LinkSetRequest, QosMapping, VxlanAddRequest,
41+
};
42+
pub use crate::neighbour::{
43+
NeighbourAddRequest, NeighbourDelRequest, NeighbourGetRequest,
44+
NeighbourHandle,
45+
};
46+
#[cfg(not(target_os = "freebsd"))]
47+
pub use crate::ns::{NetworkNamespace, NETNS_PATH, NONE_FS, SELF_NS_PATH};
48+
pub use crate::route::{
49+
IpVersion, RouteAddRequest, RouteDelRequest, RouteGetRequest, RouteHandle,
50+
RouteMessageBuilder,
51+
};
52+
pub use crate::rule::{
53+
RuleAddRequest, RuleDelRequest, RuleGetRequest, RuleHandle,
54+
};
55+
#[cfg(not(target_os = "freebsd"))]
56+
pub use crate::traffic_control::{
57+
QDiscDelRequest, QDiscGetRequest, QDiscHandle, QDiscNewRequest,
58+
TrafficChainGetRequest, TrafficChainHandle, TrafficClassGetRequest,
59+
TrafficClassHandle, TrafficFilterGetRequest, TrafficFilterHandle,
60+
TrafficFilterNewRequest,
61+
};

src/link/mod.rs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
63
mod add;
7-
pub use self::add::*;
8-
94
mod del;
10-
pub use self::del::*;
11-
125
mod get;
13-
pub use self::get::*;
14-
6+
mod handle;
7+
mod property_add;
8+
mod property_del;
159
mod set;
16-
pub use self::set::*;
17-
1810
mod set_bond_port;
19-
pub use self::set_bond_port::*;
2011

21-
mod property_add;
22-
pub use self::property_add::*;
23-
24-
mod property_del;
25-
pub use self::property_del::*;
12+
pub use self::add::{
13+
BondAddRequest, LinkAddRequest, QosMapping, VxlanAddRequest,
14+
};
15+
pub use self::del::LinkDelRequest;
16+
pub use self::get::LinkGetRequest;
17+
pub use self::handle::LinkHandle;
18+
pub use self::property_add::LinkNewPropRequest;
19+
pub use self::property_del::LinkDelPropRequest;
20+
pub use self::set::LinkSetRequest;
21+
pub use self::set_bond_port::BondPortSetRequest;
2622

2723
#[cfg(test)]
2824
mod test;

src/neighbour/mod.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
6-
mod get;
7-
pub use self::get::*;
8-
93
mod add;
10-
pub use self::add::*;
11-
124
mod del;
13-
pub use self::del::*;
5+
mod get;
6+
mod handle;
7+
8+
pub use self::add::NeighbourAddRequest;
9+
pub use self::del::NeighbourDelRequest;
10+
pub use self::get::NeighbourGetRequest;
11+
pub use self::handle::NeighbourHandle;

src/route/mod.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
63
mod add;
7-
pub use self::add::*;
8-
4+
mod builder;
95
mod del;
10-
pub use self::del::*;
11-
126
mod get;
13-
pub use self::get::*;
7+
mod handle;
148

15-
mod builder;
9+
pub use self::add::RouteAddRequest;
1610
pub use self::builder::RouteMessageBuilder;
11+
pub use self::del::RouteDelRequest;
12+
pub use self::get::{IpVersion, RouteGetRequest};
13+
pub use self::handle::RouteHandle;

src/rule/mod.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
63
mod add;
7-
pub use self::add::*;
8-
94
mod del;
10-
pub use self::del::*;
11-
125
mod get;
13-
pub use self::get::*;
6+
mod handle;
7+
8+
pub use self::add::RuleAddRequest;
9+
pub use self::del::RuleDelRequest;
10+
pub use self::get::RuleGetRequest;
11+
pub use self::handle::RuleHandle;

src/traffic_control/mod.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
// SPDX-License-Identifier: MIT
22

3-
mod handle;
4-
pub use self::handle::*;
5-
6-
mod get;
7-
pub use self::get::*;
8-
3+
mod add_filter;
94
mod add_qdisc;
10-
pub use self::add_qdisc::*;
11-
125
mod del_qdisc;
13-
pub use self::del_qdisc::*;
14-
15-
mod add_filter;
16-
pub use self::add_filter::*;
17-
6+
mod get;
7+
mod handle;
188
#[cfg(test)]
199
mod test;
10+
11+
pub use self::add_filter::TrafficFilterNewRequest;
12+
pub use self::add_qdisc::QDiscNewRequest;
13+
pub use self::del_qdisc::QDiscDelRequest;
14+
pub use self::get::{
15+
QDiscGetRequest, TrafficChainGetRequest, TrafficClassGetRequest,
16+
TrafficFilterGetRequest,
17+
};
18+
pub use self::handle::{
19+
QDiscHandle, TrafficChainHandle, TrafficClassHandle, TrafficFilterHandle,
20+
};

0 commit comments

Comments
 (0)