From c272118808a7392291463efbb27f5e85c9eadd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rnar=20Luteberget?= <luteberget@gmail.com>
Date: Fri, 17 Jan 2020 18:54:48 +0100
Subject: [PATCH] support rust 1.40: fix macro import conflict, see
 https://github.com/rust-lang/rust/issues/66518

---
 src/document/dgraph/allpaths.rs | 2 +-
 src/gui/diagram/draw.rs         | 2 +-
 src/gui/infrastructure/draw.rs  | 2 +-
 src/gui/infrastructure/menus.rs | 2 +-
 src/gui/infrastructure/mod.rs   | 2 +-
 src/gui/windows/synthesis.rs    | 2 +-
 src/import.rs                   | 2 +-
 src/synthesis/mod.rs            | 2 +-
 src/synthesis/reduce.rs         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/document/dgraph/allpaths.rs b/src/document/dgraph/allpaths.rs
index 2848fae..687c5b7 100644
--- a/src/document/dgraph/allpaths.rs
+++ b/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;
diff --git a/src/gui/diagram/draw.rs b/src/gui/diagram/draw.rs
index 2148efc..d289afc 100644
--- a/src/gui/diagram/draw.rs
+++ b/src/gui/diagram/draw.rs
@@ -1,5 +1,5 @@
 use const_cstr::*;
-use matches::*;
+use matches::matches;
 use backend_glfw::imgui::*;
 
 use crate::config::*;
diff --git a/src/gui/infrastructure/draw.rs b/src/gui/infrastructure/draw.rs
index 9085d88..c275227 100644
--- a/src/gui/infrastructure/draw.rs
+++ b/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;
diff --git a/src/gui/infrastructure/menus.rs b/src/gui/infrastructure/menus.rs
index e134cc2..2d67ae0 100644
--- a/src/gui/infrastructure/menus.rs
+++ b/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;
diff --git a/src/gui/infrastructure/mod.rs b/src/gui/infrastructure/mod.rs
index 68d10fe..dbecb6b 100644
--- a/src/gui/infrastructure/mod.rs
+++ b/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;
 
diff --git a/src/gui/windows/synthesis.rs b/src/gui/windows/synthesis.rs
index e366cf1..de59318 100644
--- a/src/gui/windows/synthesis.rs
+++ b/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::*;
diff --git a/src/import.rs b/src/import.rs
index 927bd5a..b43aa1c 100644
--- a/src/import.rs
+++ b/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;
diff --git a/src/synthesis/mod.rs b/src/synthesis/mod.rs
index 2e246ec..261e6e0 100644
--- a/src/synthesis/mod.rs
+++ b/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::*;
 
diff --git a/src/synthesis/reduce.rs b/src/synthesis/reduce.rs
index fbac8e4..d403e67 100644
--- a/src/synthesis/reduce.rs
+++ b/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;