Skip to content

Commit

Permalink
Merge pull request #285 from vadorovsky/redundant_imports
Browse files Browse the repository at this point in the history
ci: Fix workflow errors
  • Loading branch information
Manishearth authored Mar 11, 2024
2 parents 6e41827 + 344b1f2 commit 43319ab
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ impl Config {
#[cfg(feature = "tmp")]
mod config_tempdir {
use std::ops;
use tempfile;

pub struct ConfigWithTemp {
pub config: super::Config,
Expand Down
1 change: 0 additions & 1 deletion src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use errors::{Error, ErrorKind};
use runtest::ProcRes;
use serde_json;
use std::path::Path;
use std::str::FromStr;

Expand Down
1 change: 0 additions & 1 deletion src/read2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ mod imp {

#[cfg(unix)]
mod imp {
use libc;
use std::io;
use std::io::prelude::*;
use std::mem;
Expand Down
1 change: 0 additions & 1 deletion src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use common::{Assembly, Incremental, MirOpt, RunMake, Ui};
use common::{Codegen, CodegenUnits, DebugInfoGdb, DebugInfoLldb, Rustdoc};
use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind};
use common::{Config, TestPaths};
use diff;
use errors::{self, Error, ErrorKind};
use filetime::FileTime;
use header::TestProps;
Expand Down
2 changes: 1 addition & 1 deletion test-project/tests/pretty/macro.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
//@pretty-mode:expanded
//@pp-exact:macro.pp

macro_rules! square { ($x : expr) => { $x * $x } ; }
macro_rules! square { ($x:expr) => { $x * $x }; }

fn f() -> i8 { 5 * 5 }
2 changes: 1 addition & 1 deletion test-project/tests/ui/dyn-keyword.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ note: the lint level is defined here
14 | #![deny(keyword_idents)]
| ^^^^^^^^^^^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

0 comments on commit 43319ab

Please sign in to comment.