matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix for rust beta compiler

Browse source 
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>
This commit is contained in:
Matthias Beyer 2019-04-13 19:20:57 +02:00
parent 630090dd57
commit de522ec0f2
6 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/core/imag-link/src/main.rs
View file

@ -129,8 +129,6 @@ fn main() {
} }
fn get_entry_by_name<'a>(rt: &'a Runtime, name: &str) -> Result<Option<FileLockEntry<'a>>> { fn get_entry_by_name<'a>(rt: &'a Runtime, name: &str) -> Result<Option<FileLockEntry<'a>>> {
use libimagstore::storeid::StoreId;
debug!("Getting: {:?}", name); debug!("Getting: {:?}", name);
let result = StoreId::new(PathBuf::from(name)).and_then(|id| rt.store().get(id)); let result = StoreId::new(PathBuf::from(name)).and_then(|id| rt.store().get(id));

1
lib/core/libimagrt/src/configuration.rs
View file

@ -40,7 +40,6 @@ pub fn fetch_config(searchpath: &PathBuf) -> Result<Option<Value>> {
use std::io::Write; use std::io::Write;
use std::io::stderr; use std::io::stderr;
use xdg_basedir;
use itertools::Itertools; use itertools::Itertools;
use libimagutil::variants::generate_variants as gen_vars; use libimagutil::variants::generate_variants as gen_vars;

2
lib/core/libimagrt/src/lib.rs
View file

@ -39,8 +39,6 @@
#[macro_use] extern crate log; #[macro_use] extern crate log;
extern crate itertools; extern crate itertools;
#[cfg(unix)] extern crate xdg_basedir;
extern crate env_logger;
extern crate ansi_term; extern crate ansi_term;
extern crate handlebars; extern crate handlebars;
#[macro_use] extern crate failure; #[macro_use] extern crate failure;

5
lib/core/libimagrt/src/runtime.rs
View file

@ -77,8 +77,6 @@ impl<'a> Runtime<'a> {
pub fn new<C>(cli_app: C) -> Result<Runtime<'a>> pub fn new<C>(cli_app: C) -> Result<Runtime<'a>>
where C: Clone + CliSpec<'a> + InternalConfiguration where C: Clone + CliSpec<'a> + InternalConfiguration
{ {
use libimagerror::trace::trace_error;
let matches = cli_app.clone().matches(); let matches = cli_app.clone().matches();
let rtp = get_rtp_match(&matches); let rtp = get_rtp_match(&matches);
@ -354,7 +352,6 @@ impl<'a> Runtime<'a> {
use log::set_max_level; use log::set_max_level;
use log::set_boxed_logger; use log::set_boxed_logger;
use std::env::var as env_var; use std::env::var as env_var;
use env_logger;
if env_var("IMAG_LOG_ENV").is_ok() { if env_var("IMAG_LOG_ENV").is_ok() {
let _ = env_logger::try_init(); 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. /// Exported for the `imag` command, you probably do not want to use that.
pub fn get_rtp_match<'a>(matches: &ArgMatches<'a>) -> PathBuf { pub fn get_rtp_match<'a>(matches: &ArgMatches<'a>) -> PathBuf {
use std::env;
matches.value_of(Runtime::arg_runtimepath_name()) matches.value_of(Runtime::arg_runtimepath_name())
.map_or_else(|| { .map_or_else(|| {
if let Ok(home) = env::var("IMAG_RTP") { if let Ok(home) = env::var("IMAG_RTP") {

1
lib/entry/libimagentrylink/src/external.rs
View file

@ -452,7 +452,6 @@ mod tests {
use libimagstore::store::Store; use libimagstore::store::Store;
fn setup_logging() { fn setup_logging() {
use env_logger;
let _ = env_logger::try_init(); let _ = env_logger::try_init();
} }

2
lib/entry/libimagentrylink/src/internal.rs
View file

@ -395,8 +395,6 @@ impl InternalLinker for Entry {
/// Set the links in a header and return the old links, if any. /// Set the links in a header and return the old links, if any.
fn set_internal_links(&mut self, links: Vec<&mut Entry>) -> Result<LinkIter> { fn set_internal_links(&mut self, links: Vec<&mut Entry>) -> Result<LinkIter> {
use internal::iter::IntoValues;
debug!("Setting internal links"); debug!("Setting internal links");
let self_location = self.get_location().clone(); let self_location = self.get_location().clone();