From 64357e1ae803585991630b884b15a45e94afb2e1 Mon Sep 17 00:00:00 2001 From: Erik Hedvall Date: Wed, 1 Aug 2018 20:39:02 +0200 Subject: [PATCH 1/2] Import everything from the parent scope in derives --- palette_derive/src/util.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/palette_derive/src/util.rs b/palette_derive/src/util.rs index 6fbe86bdd..b9220d391 100644 --- a/palette_derive/src/util.rs +++ b/palette_derive/src/util.rs @@ -18,7 +18,7 @@ pub fn bundle_impl( #[allow(non_snake_case, unused_attributes, unused_qualifications)] mod #const_name { extern crate num_traits as _num_traits; - use super::#type_name; + use super::*; #block } } @@ -28,7 +28,7 @@ pub fn bundle_impl( mod #const_name { extern crate palette as _palette; extern crate num_traits as _num_traits; - use super::#type_name; + use super::*; #block } } From f70f926b09a8e35c78685e77bb43dc612f8cb8d5 Mon Sep 17 00:00:00 2001 From: Erik Hedvall Date: Wed, 1 Aug 2018 20:53:12 +0200 Subject: [PATCH 2/2] Enable CI checks for maintenance branches --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ee20e33ac..37f729f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ branches: - master - staging - trying + - /^\d+\.\d+$/ script: - cd palette_derive - cargo build -v --features strict