Merge pull request #82 from Mark-Simulacrum/new-env-ignore

Add new block to ignore rules

Author: Mark-Simulacrum

Cargo.lock

@@ -1,5 +1,4 @@
 use crate::offline;
-use crate::rla;
 use crate::rla::ci::{self, CiPlatform};
 use std::collections::HashSet;
 use std::io::{self, Write};

src/bin/offline/dl.rs

@@ -1,13 +1,12 @@
 use crate::offline;
-use crate::rla;
 
 use rla::index::IndexStorage;
 use std::fs;
 use std::io::{self, Write};
 use std::path::Path;
 use std::time::Duration;
 use std::time::Instant;
-use walkdir::{self, WalkDir};
+use walkdir::WalkDir;
 
 struct Line<'a> {
     _original: &'a [u8],

src/bin/offline/extract.rs

@@ -1,6 +1,4 @@
-use crate::rla;
 use anyhow::Context;
-use brotli;
 use percent_encoding::{AsciiSet, CONTROLS};
 use std::fs;
 use std::io::{Read, Write};

src/bin/offline/fs.rs

@@ -1,11 +1,10 @@
 use crate::offline;
-use crate::rla;
 
 use rla::index::IndexStorage;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::time::Instant;
-use walkdir::{self, WalkDir};
+use walkdir::WalkDir;
 
 pub fn learn(
     ci: &dyn rla::ci::CiPlatform,

src/bin/offline/learn.rs

@@ -1,5 +1,3 @@
-use crate::rla;
-
 pub use self::service::RlaService;
 pub use self::worker::Worker;
 

src/bin/server/mod.rs

@@ -1,10 +1,8 @@
 use super::QueueItem;
 
-use crate::rla;
 use anyhow::bail;
-use hyper::{self, Body, Method, StatusCode};
+use hyper::{Body, Method, StatusCode};
 use hyper::{Request, Response};
-use serde_json;
 use std::env;
 
 #[derive(Clone)]

src/bin/server/service.rs

@@ -1,6 +1,5 @@
 use super::QueueItem;
 
-use crate::rla;
 use crate::rla::ci::{self, BuildCommit, CiPlatform};
 use anyhow::bail;
 use rla::index::IndexStorage;

src/bin/server/worker.rs

@@ -1,4 +1,3 @@
-use crate::rla;
 use anyhow::Context;
 use std::process;
 

src/bin/util/mod.rs

@@ -23,10 +23,15 @@ static IGNORE_BLOCK: &[(&str, &str)] = &[
     // Skip all groups invoking git commands
     ("[command]/usr/bin/git", "##[endgroup]"),
     // Skip clock drift checks
-    ("== clock drift check ==", "== end clock drift check =="),
+    ("#[group]Clock drift check", "##[endgroup]"),
     // Skip environment variable dumps, as these can contain e.g. a SHA which is different in every
     // build.
     ("env:", "##[endgroup]"),
+    // See src/ci/scripts/dump-environment.sh in rust-lang/rust
+    (
+        "environment variables:",
+        "biggest files in the working dir:",
+    ),
 ];
 
 lazy_static! {