rename github to api

Author: Freax13

src/server/auth.rs

@@ -120,7 +120,7 @@ impl ACL {
         };
 
         if let Some(github) = github {
-            acl.refresh_cache(&github.github)?;
+            acl.refresh_cache(&github.api)?;
         }
         Ok(acl)
     }

src/server/messages.rs

@@ -67,7 +67,7 @@ impl Message {
             message.push_str(&format!("\n:{}: {}", line.emoji, line.content));
         }
 
-        github_data.github.post_comment(issue_url, &message)?;
+        github_data.api.post_comment(issue_url, &message)?;
 
         if let Some(label) = self.new_label {
             let label = match label {
@@ -78,20 +78,20 @@ impl Message {
             // Remove all the labels matching the provided regex
             // If the label is already present don't reapply it though
             let regex = &data.config.server.labels.remove;
-            let current_labels = github_data.github.list_labels(issue_url)?;
+            let current_labels = github_data.api.list_labels(issue_url)?;
             let mut label_already_present = false;
             for current_label in &current_labels {
                 if current_label.name == *label {
                     label_already_present = true;
                 } else if regex.is_match(&current_label.name) {
                     github_data
-                        .github
+                        .api
                         .remove_label(issue_url, &current_label.name)?;
                 }
             }
 
             if !label_already_present {
-                github_data.github.add_label(issue_url, label)?;
+                github_data.api.add_label(issue_url, label)?;
             }
         }
 

src/server/mod.rs

@@ -51,7 +51,7 @@ pub struct Data {
 #[derive(Clone)]
 pub struct GithubData {
     pub bot_username: String,
-    pub github: GitHubApi,
+    pub api: GitHubApi,
     pub tokens: BotTokens,
 }
 
@@ -67,7 +67,7 @@ pub fn run(config: Config, bind: SocketAddr) -> Fallible<()> {
             let bot_username = github.username()?;
             info!("bot username: {}", bot_username);
             Fallible::Ok(GithubData {
-                github,
+                api: github,
                 bot_username,
                 tokens,
             })

src/server/routes/webhooks/commands.rs

@@ -86,10 +86,10 @@ pub fn run(
                 format!("Automatically detected try build {}", build.merge_sha),
             );
             let pr_head = github_data
-                .github
+                .api
                 .get_pr_head_sha(&repo.full_name, issue.number)?;
             let mut merge_commit = github_data
-                .github
+                .api
                 .get_commit(&repo.full_name, &build.merge_sha)?;
             if merge_commit.parents.len() == 2 {
                 // The first parent is the rust-lang/rust commit, and the second
@@ -275,7 +275,7 @@ pub fn abort(
 }
 
 pub fn reload_acl(data: &Data, github_data: &GithubData, issue: &Issue) -> Fallible<()> {
-    data.acl.refresh_cache(&github_data.github)?;
+    data.acl.refresh_cache(&github_data.api)?;
 
     Message::new()
         .line("hammer_and_wrench", "List of authorized users reloaded!")

src/server/routes/webhooks/mod.rs

@@ -38,7 +38,7 @@ fn process_webhook(
 
             crate::server::try_builds::detect(
                 &data.db,
-                &github_data.github,
+                &github_data.api,
                 &p.repository.full_name,
                 p.issue.number,
                 &p.comment.body,