Skip to content

Commit

Permalink
Merge #141
Browse files Browse the repository at this point in the history
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 <dev@codyps.com>
  • Loading branch information
bors[bot] and codyps committed Oct 5, 2020
2 parents daa376c + 51521e2 commit 7225e6e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
/// [libsystemd](https://crates.io/crates/libsystemd) crate, and you may prefer to use it instead.
use super::ffi::{c_int, pid_t, size_t};
use super::{Error, Result};
use ::ffi::daemon as ffi;
use cstr_argument::CStrArgument;
use ffi::daemon as ffi;
use libc::{c_char, c_uint};
use libc::{SOCK_DGRAM, SOCK_RAW, SOCK_STREAM};
use std::io::ErrorKind;
Expand Down
2 changes: 1 addition & 1 deletion src/login.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::ffi::{c_char, c_uint, pid_t, uid_t};
use super::{free_cstring, Result};
use ::ffi::login as ffi;
use cstr_argument::CStrArgument;
use ffi::login as ffi;
use std::ptr;

/// Systemd slice and unit types
Expand Down

0 comments on commit 7225e6e

Please sign in to comment.