Merge pull request #257 from Alexendoo/commit-message-null

Replace null bytes in commit message descriptions

Author: JohnTitor

.github/workflows/autofix.yml

@@ -9,6 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'rust-lang/glacier'
 
+    env:
+      RUST_LIB_BACKTRACE: 1
+
     steps:
       - uses: actions/checkout@v1
 

Cargo.lock

@@ -7,6 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.26"
 rayon = "1.2.0"
 tempfile = "3.1.0"
 

Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.26"
 glacier = { path = ".." }
 once_cell = "1.2.0"
 reqwest = "0.9.21"

autofix/Cargo.toml

@@ -1,7 +1,7 @@
 use crate::github::{self, pull_request, PullRequestOptions};
+use anyhow::{Context, Result};
 use git2::{PushOptions, RemoteCallbacks, Repository, Tree};
 use glacier::TestResult;
-use std::error::Error;
 use std::fs::read_to_string;
 use std::path::{Path, PathBuf};
 
@@ -14,7 +14,7 @@ struct Descriptions {
     pr_body: String,
 }
 
-fn format_descriptions(test: &TestResult) -> Result<Descriptions, Box<dyn Error>> {
+fn format_descriptions(test: &TestResult) -> Result<Descriptions> {
     let title = test.title();
     let description = test.description().unwrap();
 
@@ -44,18 +44,18 @@ fn new_path_bytes(old: &Path) -> Option<Vec<u8>> {
     Some(new.to_str()?.as_bytes().to_vec())
 }
 
-fn move_to_fixed<'a>(repo: &'a Repository, test: &TestResult) -> Result<Tree<'a>, Box<dyn Error>> {
+fn move_to_fixed<'a>(repo: &'a Repository, test: &TestResult) -> Result<Tree<'a>> {
     let mut index = repo.index()?;
 
     // Stage 0 = normal file, not part of a merge
     let mut entry = index
         .get_path(test.path(), 0)
-        .ok_or_else(|| format!("not found in index: {}", test.path().display()))?;
+        .with_context(|| format!("not found in index: {}", test.path().display()))?;
 
     index.remove(test.path(), 0)?;
 
     let new_path =
-        new_path_bytes(test.path()).ok_or_else(|| format!("ICE has no filename: {:?}", test))?;
+        new_path_bytes(test.path()).with_context(|| format!("ICE has no filename: {:?}", test))?;
 
     entry.path = new_path;
 
@@ -66,7 +66,7 @@ fn move_to_fixed<'a>(repo: &'a Repository, test: &TestResult) -> Result<Tree<'a>
     Ok(repo.find_tree(id)?)
 }
 
-fn push(repo: &Repository, refspec: &str, config: &github::Config) -> Result<(), Box<dyn Error>> {
+fn push(repo: &Repository, refspec: &str, config: &github::Config) -> Result<()> {
     let mut callbacks = RemoteCallbacks::new();
 
     callbacks.push_update_reference(|_ref, status| match status {
@@ -85,7 +85,7 @@ fn push(repo: &Repository, refspec: &str, config: &github::Config) -> Result<(),
     Ok(())
 }
 
-pub(crate) fn fix(test: &TestResult, config: &github::Config) -> Result<(), Box<dyn Error>> {
+pub(crate) fn fix(test: &TestResult, config: &github::Config) -> Result<()> {
     let repo = Repository::open(".")?;
 
     let path = test.path().display();

autofix/src/fix.rs

@@ -1,7 +1,8 @@
+use anyhow::Result;
 use once_cell::sync::Lazy;
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
-use std::env::{var, VarError};
+use std::env::var;
 
 static CLIENT: Lazy<Client> = Lazy::new(Client::new);
 
@@ -11,7 +12,7 @@ pub(crate) struct Config {
 }
 
 impl Config {
-    pub(crate) fn from_env() -> Result<Self, VarError> {
+    pub(crate) fn from_env() -> Result<Self> {
         Ok(Self {
             token: var("GITHUB_TOKEN")?,
             repo: var("GITHUB_REPOSITORY")?,
@@ -40,10 +41,7 @@ struct PullRequest {
     html_url: String,
 }
 
-pub(crate) fn pull_request(
-    config: &Config,
-    options: &PullRequestOptions,
-) -> Result<String, reqwest::Error> {
+pub(crate) fn pull_request(config: &Config, options: &PullRequestOptions) -> Result<String> {
     let url = format!("https://api.github.com/repos/{}/pulls", config.repo);
 
     let pr: PullRequest = CLIENT

autofix/src/github.rs

@@ -1,17 +1,17 @@
 mod fix;
 mod github;
 
+use anyhow::{Context, Result};
 use fix::fix;
 use glacier::rayon::prelude::*;
 use glacier::{test_all, Outcome};
-use std::error::Error;
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<()> {
     let config = github::Config::from_env()?;
 
     test_all()?
-        .collect::<Result<Vec<_>, _>>()?
+        .collect::<Result<Vec<_>>>()?
         .into_iter()
         .filter(|result| result.outcome() != Outcome::ICEd)
-        .try_for_each(|result| fix(&result, &config))
+        .try_for_each(|result| fix(&result, &config).context(result))
 }

autofix/src/main.rs

@@ -1,5 +1,5 @@
+use anyhow::{bail, Result};
 use rayon::prelude::*;
-use std::error::Error;
 use std::fmt;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -23,17 +23,17 @@ struct ICE {
 }
 
 impl ICE {
-    fn from_path(path: PathBuf) -> Result<Self, Box<dyn Error>> {
+    fn from_path(path: PathBuf) -> Result<Self> {
         let mode = match path.extension().and_then(|e| e.to_str()) {
             Some("rs") => TestMode::SingleFile,
             Some("sh") => TestMode::ShellScript,
-            _ => return Err(format!("unknown ICE test extension: {}", path.display()).into()),
+            _ => bail!("unknown ICE test extension: {}", path.display()),
         };
 
         Ok(Self { path, mode })
     }
 
-    fn test(self) -> Result<TestResult, Box<dyn Error>> {
+    fn test(self) -> Result<TestResult> {
         let workdir = tempfile::tempdir()?;
         let output = match self.mode {
             TestMode::SingleFile => Command::new(RUSTC)
@@ -111,7 +111,7 @@ impl TestResult {
             out.push_str(self.stderr());
             out.push_str("==============");
 
-            Some(out)
+            Some(out.replace('\0', "NUL"))
         } else {
             None
         }
@@ -148,7 +148,7 @@ impl fmt::Display for TestResult {
     }
 }
 
-fn discover(dir: &str) -> Result<Vec<ICE>, Box<dyn Error>> {
+fn discover(dir: &str) -> Result<Vec<ICE>> {
     let mut ices = Vec::new();
     for entry in std::fs::read_dir(dir)? {
         let entry = entry?;
@@ -167,12 +167,8 @@ fn discover(dir: &str) -> Result<Vec<ICE>, Box<dyn Error>> {
     Ok(ices)
 }
 
-pub fn test_all() -> Result<impl IndexedParallelIterator<Item = Result<TestResult, String>>, String>
-{
-    let iter = discover(ICES_PATH)
-        .map_err(|e| e.to_string())?
-        .into_par_iter()
-        .map(|ice| ice.test().map_err(|e| e.to_string()));
+pub fn test_all() -> Result<impl IndexedParallelIterator<Item = Result<TestResult>>> {
+    let iter = discover(ICES_PATH)?.into_par_iter().map(|ice| ice.test());
 
     Ok(iter)
 }

src/lib.rs

@@ -1,10 +1,10 @@
+use anyhow::{bail, Result};
 use glacier::Outcome;
 use rayon::prelude::*;
-use std::error::Error;
 
-fn main() -> Result<(), Box<dyn Error>> {
+fn main() -> Result<()> {
     let failed = glacier::test_all()?
-        .map(|res| -> Result<bool, String> {
+        .map(|res| -> Result<bool> {
             let result = res?;
             println!("{}", result);
 
@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .try_reduce(|| false, |a, b| Ok(a || b))?;
 
     if failed {
-        Err("some ICEs are now fixed!".into())
+        bail!("some ICEs are now fixed!");
     } else {
         Ok(())
     }