diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2019-04-13 19:20:57 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2019-04-13 22:06:53 +0200 |
| commit | de522ec0f2acc4e3651f77fdbe7f5295b6702c0d (patch) | |
| tree | a78bde4883da98519f5b9d6013ab8587e22e6381 /lib/core/libimagrt/src | |
| parent | 630090dd57df625e7d0f5b969584b920c491c99f (diff) | |
Fix for rust beta compiler
The beta compiler reports duplicated input:
error: the item `IntoValues` is imported redundantly
--> lib/entry/libimagentrylink/src/internal.rs:398:13
|
36 | use self::iter::IntoValues;
| ---------------------- the item `IntoValues` is already imported here
...
398 | use internal::iter::IntoValues;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
so we fix this here.
Other imports were fixed as well.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/core/libimagrt/src')
| -rw-r--r-- | lib/core/libimagrt/src/configuration.rs | 1 | ||||
| -rw-r--r-- | lib/core/libimagrt/src/lib.rs | 2 | ||||
| -rw-r--r-- | lib/core/libimagrt/src/runtime.rs | 5 |
3 files changed, 0 insertions, 8 deletions
diff --git a/lib/core/libimagrt/src/configuration.rs b/lib/core/libimagrt/src/configuration.rs index 286cad07..20f1a223 100644 --- a/lib/core/libimagrt/src/configuration.rs +++ b/lib/core/libimagrt/src/configuration.rs @@ -40,7 +40,6 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Option<Value>> { use std::io::Write; use std::io::stderr; - use xdg_basedir; use itertools::Itertools; use libimagutil::variants::generate_variants as gen_vars; diff --git a/lib/core/libimagrt/src/lib.rs b/lib/core/libimagrt/src/lib.rs index 65e3e031..825b49e0 100644 --- a/lib/core/libimagrt/src/lib.rs +++ b/lib/core/libimagrt/src/lib.rs @@ -39,8 +39,6 @@ #[macro_use] extern crate log; extern crate itertools; -#[cfg(unix)] extern crate xdg_basedir; -extern crate env_logger; extern crate ansi_term; extern crate handlebars; #[macro_use] extern crate failure; diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs index fdbc1b86..6eadc12c 100644 --- a/lib/core/libimagrt/src/runtime.rs +++ b/lib/core/libimagrt/src/runtime.rs @@ -77,8 +77,6 @@ impl<'a> Runtime<'a> { pub fn new<C>(cli_app: C) -> Result<Runtime<'a>> where C: Clone + CliSpec<'a> + InternalConfiguration { - use libimagerror::trace::trace_error; - let matches = cli_app.clone().matches(); let rtp = get_rtp_match(&matches); @@ -354,7 +352,6 @@ impl<'a> Runtime<'a> { use log::set_max_level; use log::set_boxed_logger; use std::env::var as env_var; - use env_logger; if env_var("IMAG_LOG_ENV").is_ok() { let _ = env_logger::try_init(); @@ -643,8 +640,6 @@ pub trait IdPathProvider { /// Exported for the `imag` command, you probably do not want to use that. pub fn get_rtp_match<'a>(matches: &ArgMatches<'a>) -> PathBuf { - use std::env; - matches.value_of(Runtime::arg_runtimepath_name()) .map_or_else(|| { if let Ok(home) = env::var("IMAG_RTP") { |