Merge pull request #72 from tmandry/improvements

Look for FCP issues, improve output somewhat

Author: tmandry

README.md

@@ -6,7 +6,7 @@ sections where possible, and prints the document to `stdout`.
 
 ## Requirements
 `relnotes` uses the GitHub API to generate the release notes, as such you need
-a valid GitHub API key. `relnotes` will look for `GITHUB_API_KEY` in the
+a valid GitHub API key. `relnotes` will look for `GITHUB_TOKEN` in the
 environment and use that key when sending requests.
 
 **small warning:** `relnotes` makes a lot of requests as GitHub only allows you to

src/main.rs

@@ -68,8 +68,10 @@ fn main() {
             .any(|o| SKIP_LABELS.contains(&o["name"].as_str().unwrap()))
     });
 
+    let relnotes_tags = &["relnotes", "finished-final-comment-period"];
+
     let links = map_to_link_items("", in_release.clone());
-    let (relnotes, rest) = partition_by_tag(in_release, "relnotes");
+    let (relnotes, rest) = partition_by_tag(in_release, relnotes_tags);
 
     let (
         compat_relnotes,
@@ -85,7 +87,7 @@ fn main() {
     let cargo_issues = get_issues(start, end, "cargo");
 
     let (cargo_relnotes, cargo_unsorted) = {
-        let (relnotes, rest) = partition_by_tag(cargo_issues.iter(), "relnotes");
+        let (relnotes, rest) = partition_by_tag(cargo_issues.iter(), relnotes_tags);
 
         (
             map_to_line_items("cargo/", relnotes),
@@ -121,12 +123,13 @@ fn get_issues(start: Date<Utc>, end: Date<Utc>, repo_name: &'static str) -> Vec<
     use reqwest::blocking::Client;
     use reqwest::header::*;
 
+    let token = env::var("GITHUB_TOKEN").expect("Set GITHUB_TOKEN to a valid token");
     let mut headers = HeaderMap::new();
     headers.insert(CONTENT_TYPE, "application/json".parse().unwrap());
     headers.insert(ACCEPT, "application/json".parse().unwrap());
     headers.insert(
         AUTHORIZATION,
-        format!("Bearer {}", env::var("GITHUB_TOKEN").unwrap())
+        format!("Bearer {}", token)
             .parse()
             .unwrap(),
     );
@@ -262,24 +265,24 @@ fn map_to_link_items<'a>(
 
 fn partition_by_tag<'a>(
     iter: impl IntoIterator<Item = &'a json::Value>,
-    tag: &str,
+    tags: &[&str],
 ) -> (JsonRefArray<'a>, JsonRefArray<'a>) {
     iter.into_iter().partition(|o| {
         o["labels"]["nodes"]
             .as_array()
             .unwrap()
             .iter()
-            .any(|o| o["name"] == tag)
+            .any(|o| tags.iter().any(|tag| o["name"] == *tag))
     })
 }
 
 fn partition_prs<'a>(
     iter: impl IntoIterator<Item = &'a json::Value>,
 ) -> (String, String, String, String, String) {
-    let (compat_notes, rest) = partition_by_tag(iter, "C-future-compatibility");
-    let (libs, rest) = partition_by_tag(rest, "T-libs");
-    let (lang, rest) = partition_by_tag(rest, "T-lang");
-    let (compiler, rest) = partition_by_tag(rest, "T-compiler");
+    let (compat_notes, rest) = partition_by_tag(iter, &["C-future-compatibility"]);
+    let (libs, rest) = partition_by_tag(rest, &["T-libs"]);
+    let (lang, rest) = partition_by_tag(rest, &["T-lang"]);
+    let (compiler, rest) = partition_by_tag(rest, &["T-compiler"]);
 
     (
         map_to_line_items("", compat_notes),

templates/relnotes.md

@@ -6,20 +6,23 @@ Language
 **relnotes**
 {{language_relnotes}}
 
+**other**
 {{language_unsorted}}
 
 Compiler
 --------
 **relnotes**
 {{compiler_relnotes}}
 
+**other**
 {{compiler_unsorted}}
 
 Libraries
 ---------
 **relnotes**
 {{libraries_relnotes}}
 
+**other**
 {{libraries_unsorted}}
 
 Stabilized APIs
@@ -30,6 +33,7 @@ Cargo
 **relnotes**
 {{cargo_relnotes}}
 
+**other**
 {{cargo_unsorted}}
 
 Misc
@@ -40,13 +44,22 @@ Compatibility Notes
 **relnotes**
 {{compat_relnotes}}
 
+**other**
 {{compat_unsorted}}
 
+Internal Changes
+----------------
+
+These changes provide no direct user facing benefits, but represent significant
+improvements to the internals and overall performance of rustc
+and related tools.
+
 UNSORTED
 --------
 **relnotes**
 {{unsorted_relnotes}}
 
+**other**
 {{unsorted}}
 
 {{links}}