Skip to content

Commit

Permalink
fix rust 1.43 lints
Browse files Browse the repository at this point in the history
  • Loading branch information
nmattia committed Jul 30, 2020
1 parent 536007d commit 47ffe9d
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion src/dfx/src/commands/language_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use crate::lib::environment::Environment;
use crate::lib::error::{DfxError, DfxResult};
use crate::lib::message::UserMessage;
use crate::lib::package_arguments::{self, PackageArguments};
use atty;
use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
use std::process::Stdio;

Expand Down
2 changes: 1 addition & 1 deletion src/dfx/src/lib/builders/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ fn delete_output_directory(
let output_assets_path = output_assets_path.canonicalize()?;
if !output_assets_path.starts_with(info.get_workspace_root()) {
return Err(DfxError::DirectoryIsOutsideWorkspaceRoot(
output_assets_path.to_path_buf(),
output_assets_path,
));
}
fs::remove_dir_all(output_assets_path)?;
Expand Down
2 changes: 0 additions & 2 deletions src/dfx/src/lib/canister_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,13 @@ impl CanisterInfo {
.join(PathBuf::from(&self.name))
.join(&self.name)
.with_extension("wasm")
.to_path_buf()
}

pub fn get_build_idl_path(&self) -> PathBuf {
self.build_root
.join(PathBuf::from(&self.name))
.join(&self.name)
.with_extension("did")
.to_path_buf()
}

pub fn get_output_wasm_path(&self) -> Option<PathBuf> {
Expand Down
2 changes: 0 additions & 2 deletions src/dfx/src/lib/logger.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use crate::config::dfx_version_str;
use slog::{Drain, Level, Logger};
use slog_async;
use slog_term;
use std::fs::File;
use std::path::PathBuf;

Expand Down
1 change: 0 additions & 1 deletion src/dfx/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::lib::environment::{Environment, EnvironmentImpl};
use crate::lib::error::*;
use crate::lib::logger::{create_root_logger, LoggingMode};
use clap::{App, AppSettings, Arg, ArgMatches};
use slog;
use std::path::PathBuf;

mod actors;
Expand Down

0 comments on commit 47ffe9d

Please sign in to comment.