Merge topic 'import-avoid-super'

bb3c35ef

 imports: import from the top-level rather than via super
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !72

src/gitlab.rs

@@ -18,8 +18,8 @@ extern crate serde_json;
 extern crate url;
 use self::url::percent_encoding::{PATH_SEGMENT_ENCODE_SET, percent_encode};
 
-use super::error::*;
-use super::types::*;
+use error::*;
+use types::*;
 
 use std::borrow::Borrow;
 use std::fmt::{self, Debug};

src/hooks.rs

@@ -20,8 +20,8 @@ use self::serde::de::Error;
 extern crate serde_json;
 use self::serde_json::Value;
 
-use super::systemhooks::SystemHook;
-use super::webhooks::WebHook;
+use systemhooks::SystemHook;
+use webhooks::WebHook;
 
 #[derive(Debug, Clone)]
 /// A deserializable structure for all Gitlab hooks.

src/systemhooks.rs.in

@@ -16,8 +16,8 @@ use self::serde::de::{Error, Type};
 extern crate serde_json;
 use self::serde_json::Value;
 
-use super::types::{AccessLevel, GroupId, ObjectId, ProjectId, SshKeyId, UserId};
-use super::webhooks::{CommitHookAttrs, ProjectHookAttrs};
+use types::{AccessLevel, GroupId, ObjectId, ProjectId, SshKeyId, UserId};
+use webhooks::{CommitHookAttrs, ProjectHookAttrs};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 /// Events which occur at the project level.

src/test/types.rs

@@ -15,7 +15,7 @@ use self::serde::Deserialize;
 extern crate serde_json;
 use self::serde_json::from_reader;
 
-use super::super::types::*;
+use types::*;
 
 use std::fs::File;
 

src/webhooks.rs.in

@@ -16,7 +16,7 @@ use self::serde::de::{Error, Type};
 extern crate serde_json;
 use self::serde_json::Value;
 
-use super::types::{BuildId, IssueId, IssueState, MergeRequestId, MergeRequestState, MergeStatus,
+use types::{BuildId, IssueId, IssueState, MergeRequestId, MergeRequestState, MergeStatus,
             MilestoneId, NoteId, NoteType, NoteableId, ObjectId, ProjectId, SnippetId, UserId};
 
 #[derive(Debug, Clone, Copy)]