Commit 143f6ecc authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'import-avoid-super'

bb3c35ef

 imports: import from the top-level rather than via super
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !72
parents f127e242 bb3c35ef
...@@ -18,8 +18,8 @@ extern crate serde_json; ...@@ -18,8 +18,8 @@ extern crate serde_json;
extern crate url; extern crate url;
use self::url::percent_encoding::{PATH_SEGMENT_ENCODE_SET, percent_encode}; use self::url::percent_encoding::{PATH_SEGMENT_ENCODE_SET, percent_encode};
use super::error::*; use error::*;
use super::types::*; use types::*;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::fmt::{self, Debug}; use std::fmt::{self, Debug};
......
...@@ -20,8 +20,8 @@ use self::serde::de::Error; ...@@ -20,8 +20,8 @@ use self::serde::de::Error;
extern crate serde_json; extern crate serde_json;
use self::serde_json::Value; use self::serde_json::Value;
use super::systemhooks::SystemHook; use systemhooks::SystemHook;
use super::webhooks::WebHook; use webhooks::WebHook;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// A deserializable structure for all Gitlab hooks. /// A deserializable structure for all Gitlab hooks.
......
...@@ -16,8 +16,8 @@ use self::serde::de::{Error, Type}; ...@@ -16,8 +16,8 @@ use self::serde::de::{Error, Type};
extern crate serde_json; extern crate serde_json;
use self::serde_json::Value; use self::serde_json::Value;
use super::types::{AccessLevel, GroupId, ObjectId, ProjectId, SshKeyId, UserId}; use types::{AccessLevel, GroupId, ObjectId, ProjectId, SshKeyId, UserId};
use super::webhooks::{CommitHookAttrs, ProjectHookAttrs}; use webhooks::{CommitHookAttrs, ProjectHookAttrs};
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
/// Events which occur at the project level. /// Events which occur at the project level.
......
...@@ -15,7 +15,7 @@ use self::serde::Deserialize; ...@@ -15,7 +15,7 @@ use self::serde::Deserialize;
extern crate serde_json; extern crate serde_json;
use self::serde_json::from_reader; use self::serde_json::from_reader;
use super::super::types::*; use types::*;
use std::fs::File; use std::fs::File;
......
...@@ -16,8 +16,8 @@ use self::serde::de::{Error, Type}; ...@@ -16,8 +16,8 @@ use self::serde::de::{Error, Type};
extern crate serde_json; extern crate serde_json;
use self::serde_json::Value; 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}; MilestoneId, NoteId, NoteType, NoteableId, ObjectId, ProjectId, SnippetId, UserId};
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
/// A wrapper struct for dates in web hooks. /// A wrapper struct for dates in web hooks.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment