support rust 1.40: fix macro import conflict, see rust-lang/rust#66518

Author: luteberget

src/document/dgraph/allpaths.rs

@@ -1,4 +1,4 @@
-use matches::*;
+use matches::matches;
 use rolling::input::staticinfrastructure::*;
 use std::collections::HashSet;
 use ordered_float::OrderedFloat;

src/gui/diagram/draw.rs

@@ -1,5 +1,5 @@
 use const_cstr::*;
-use matches::*;
+use matches::matches;
 use backend_glfw::imgui::*;
 
 use crate::config::*;

src/gui/infrastructure/draw.rs

@@ -12,7 +12,7 @@ use crate::config::*;
 
 use backend_glfw::imgui::*;
 use nalgebra_glm as glm;
-use matches::*;
+use matches::matches;
 use std::collections::HashMap;
 
 use rolling::input::staticinfrastructure as rolling_inf;

src/gui/infrastructure/menus.rs

@@ -1,5 +1,5 @@
 use const_cstr::*;
-use matches::*;
+use matches::matches;
 use backend_glfw::imgui::*;
 use rolling::input::staticinfrastructure as rolling_inf;
 use std::ffi::CString;

src/gui/infrastructure/mod.rs

@@ -2,7 +2,7 @@ pub mod draw;
 pub mod menus;
 
 use const_cstr::*;
-use matches::*;
+use matches::matches;
 use backend_glfw::imgui::*;
 use nalgebra_glm as glm;
 

src/gui/windows/synthesis.rs

@@ -1,4 +1,4 @@
-use matches::*;
+use matches::matches;
 use nalgebra_glm as glm;
 use ordered_float::OrderedFloat;
 use const_cstr::*;

src/import.rs

@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use log::*;
-use matches::*;
+use matches::matches;
 use const_cstr::const_cstr;
 use crate::document::model::*;
 use crate::document::model;

src/synthesis/mod.rs

@@ -1,7 +1,7 @@
 use numerical_optimization::powell::*;
 use std::collections::{HashMap,HashSet, BTreeSet};
 use boolinator::Boolinator;
-use matches::*;
+use matches::matches;
 use nalgebra_glm as glm;
 use log::*;
 

src/synthesis/reduce.rs

@@ -1,4 +1,4 @@
-use matches::*;
+use matches::matches;
 use std::collections::HashMap;
 use std::collections::BTreeSet;
 use rolling::input::staticinfrastructure as rolling_inf;