Skip to content

Commit

Permalink
Fix build: missing lifetime parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
tesuji committed Jun 21, 2019
1 parent 045e408 commit cdfb354
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ fn run_server_process() -> Result<ServerStartup> {
use std::ptr;
use std::time::Duration;
use tokio::reactor::Handle;
use tokio::runtime::current_thread::Runtime;
use tokio_named_pipes::NamedPipe;
use uuid::Uuid;
use winapi::shared::minwindef::{DWORD, FALSE, LPVOID, TRUE};
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fn encode_path(dst: &mut dyn Write, path: &Path) -> io::Result<()> {
}

#[cfg(windows)]
fn encode_path(dst: &mut Write, path: &Path) -> io::Result<()> {
fn encode_path(dst: &mut dyn Write, path: &Path) -> io::Result<()> {
use std::os::windows::prelude::*;
use local_encoding::windows::wide_char_to_multi_byte;
use winapi::um::winnls::CP_OEMCP;
Expand Down
4 changes: 2 additions & 2 deletions src/dist/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ mod path_transform {
use std::path::{Component, Components, Path, PathBuf, Prefix, PrefixComponent};
use std::str;

fn take_prefix<'a>(components: &'a mut Components) -> Option<PrefixComponent<'a>> {
fn take_prefix<'a>(components: &'a mut Components<'_>) -> Option<PrefixComponent<'a>> {
let prefix = components.next()?;
let pc = match prefix {
Component::Prefix(pc) => pc,
Expand All @@ -70,7 +70,7 @@ mod path_transform {
Some(pc)
}

fn transform_prefix_component(pc: PrefixComponent) -> Option<String> {
fn transform_prefix_component(pc: PrefixComponent<'_>) -> Option<String> {
match pc.kind() {
// Transforming these to the same place means these may flip-flop
// in the tracking map, but they're equivalent so not really an
Expand Down
2 changes: 1 addition & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use futures_cpupool::CpuPool;
use crate::mock_command::{CommandChild, RunCommand};
use ring::digest::{Context, SHA512};
use serde::Serialize;
use std::env;
use std::ffi::{OsStr, OsString};
use std::fs::File;
use std::hash::Hasher;
Expand Down Expand Up @@ -433,6 +432,7 @@ mod http_extension {
#[cfg(not(windows))]
pub fn daemonize() -> Result<()> {
use daemonize::Daemonize;
use std::env;
use std::mem;

match env::var("SCCACHE_NO_DAEMON") {
Expand Down

0 comments on commit cdfb354

Please sign in to comment.