Skip to content

Commit 0fd4d96

Browse files
committed
Revert "Add error context for reading vendor dir."
This reverts commit 85b5b18.
1 parent d274fcf commit 0fd4d96

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/cargo/core/compiler/standard_lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::core::resolver::features::{FeaturesFor, ResolvedFeatures};
77
use crate::core::resolver::{HasDevUnits, ResolveOpts};
88
use crate::core::{Dependency, PackageId, PackageSet, Resolve, SourceId, Workspace};
99
use crate::ops::{self, Packages};
10-
use crate::util::errors::{CargoResult, CargoResultExt};
10+
use crate::util::errors::CargoResult;
1111
use std::collections::{HashMap, HashSet};
1212
use std::env;
1313
use std::fs;
@@ -52,8 +52,7 @@ pub fn resolve_std<'cfg>(
5252

5353
// If rust-src contains a "vendor" directory, then patch in all the crates it contains.
5454
let vendor_path = src_path.join("vendor");
55-
let vendor_dir = fs::read_dir(&vendor_path)
56-
.chain_err(|| format!("could not read vendor path {}", vendor_path.display()))?;
55+
let vendor_dir = fs::read_dir(vendor_path)?;
5756
let patches = vendor_dir
5857
.into_iter()
5958
.map(|entry| {
@@ -75,8 +74,7 @@ pub fn resolve_std<'cfg>(
7574
let dep = Dependency::parse_no_deprecated(&name, None, source_path)?;
7675
Ok(dep)
7776
})
78-
.collect::<CargoResult<Vec<_>>>()
79-
.chain_err(|| "failed to generate vendor patches")?;
77+
.collect::<CargoResult<Vec<_>>>()?;
8078

8179
let crates_io_url = crate::sources::CRATES_IO_INDEX.parse().unwrap();
8280
let mut patch = HashMap::new();

0 commit comments

Comments
 (0)