Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

Commit c43a5ec

Browse files
committed
More updates to anyhow
1 parent c3f8cd3 commit c43a5ec

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

Diff for: examples/fix-json.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use rustfix;
2-
3-
use failure::Error;
1+
use anyhow::Error;
42
use std::io::{stdin, BufReader, Read};
53
use std::{collections::HashMap, collections::HashSet, env, fs};
64

Diff for: tests/parse_and_replace.rs

+5-18
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
#![cfg(not(windows))] // TODO: should fix these tests on Windows
22

3-
use duct;
4-
use env_logger;
5-
#[macro_use]
6-
extern crate log;
7-
use rustfix;
8-
9-
#[macro_use]
10-
extern crate failure;
11-
123
use std::collections::HashSet;
134
use std::env;
145
use std::ffi::OsString;
156
use std::fs;
167
use std::path::{Path, PathBuf};
178
use std::process::Output;
18-
19-
use failure::{Error, ResultExt};
9+
use anyhow::{Error, Context, ensure, anyhow};
2010
use tempdir::TempDir;
21-
2211
use rustfix::apply_suggestions;
12+
use log::{info, warn, debug};
2313

2414
mod fixmode {
2515
pub const EVERYTHING: &str = "yolo";
@@ -67,7 +57,7 @@ fn compile_and_get_json_errors(file: &Path, mode: &str) -> Result<String, Error>
6757

6858
match res.status.code() {
6959
Some(0) | Some(1) | Some(101) => Ok(stderr),
70-
_ => Err(format_err!(
60+
_ => Err(anyhow!(
7161
"failed with status {:?}: {}",
7262
res.status.code(),
7363
stderr
@@ -86,7 +76,7 @@ fn compiles_without_errors(file: &Path, mode: &str) -> Result<(), Error> {
8676
file,
8777
String::from_utf8(res.stderr)?
8878
);
89-
Err(format_err!(
79+
Err(anyhow!(
9080
"failed with status {:?} (`env RUST_LOG=parse_and_replace=info` for more info)",
9181
res.status.code(),
9282
))
@@ -226,10 +216,7 @@ fn assert_fixtures(dir: &str, mode: &str) {
226216
for file in &files {
227217
if let Err(err) = test_rustfix_with_file(file, mode) {
228218
println!("failed: {}", file.display());
229-
warn!("{}", err);
230-
for cause in err.iter_chain().skip(1) {
231-
info!("\tcaused by: {}", cause);
232-
}
219+
warn!("{:?}", err);
233220
failures += 1;
234221
}
235222
info!("passed: {:?}", file);

0 commit comments

Comments
 (0)