Skip to content

Commit 7225e6e

Browse files
bors[bot]codyps
andauthored
Merge #141
141: use :: to disambiguate `use` r=jmesmon a=jmesmon Without this, rustc 1.48 (as of now, rustc nightly-2020-10-04) is expected to fail to build rust-systemd. Rustc issue: rust-lang/rust#77586 Co-authored-by: Cody Schafer <[email protected]>
2 parents daa376c + 51521e2 commit 7225e6e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/daemon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
/// [libsystemd](https://crates.io/crates/libsystemd) crate, and you may prefer to use it instead.
55
use super::ffi::{c_int, pid_t, size_t};
66
use super::{Error, Result};
7+
use ::ffi::daemon as ffi;
78
use cstr_argument::CStrArgument;
8-
use ffi::daemon as ffi;
99
use libc::{c_char, c_uint};
1010
use libc::{SOCK_DGRAM, SOCK_RAW, SOCK_STREAM};
1111
use std::io::ErrorKind;

src/login.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::ffi::{c_char, c_uint, pid_t, uid_t};
22
use super::{free_cstring, Result};
3+
use ::ffi::login as ffi;
34
use cstr_argument::CStrArgument;
4-
use ffi::login as ffi;
55
use std::ptr;
66

77
/// Systemd slice and unit types

0 commit comments

Comments
 (0)