Skip to content

Commit a57c49e

Browse files
authored
Merge pull request #271 from QuietMisdreavus/new-cargo
update cargo
2 parents e287639 + 0b37789 commit a57c49e

File tree

2 files changed

+69
-34
lines changed

2 files changed

+69
-34
lines changed

Cargo.lock

+58-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils/build_doc.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
3737
let source_id = try!(SourceId::crates_io(&config));
3838

3939
let source_cfg_map = try!(SourceConfigMap::new(&config));
40-
let mut source = try!(source_cfg_map.load(&source_id));
40+
let mut source = try!(source_cfg_map.load(source_id));
4141

4242
// update crates.io-index registry
4343
try!(source.update());
4444

45-
let dep = try!(Dependency::parse_no_deprecated(name, vers, &source_id));
45+
let dep = try!(Dependency::parse_no_deprecated(name, vers, source_id));
4646
let deps = try!(source.query_vec(&dep));
4747
let pkgid = try!(deps.iter().map(|p| p.package_id()).max()
4848
// FIXME: This is probably not a rusty way to handle options and results
@@ -54,7 +54,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
5454

5555
let pkg_set = try!(PackageSet::new(&[pkgid.clone()], source_map, &config));
5656

57-
let pkg = try!(pkg_set.get_one(&pkgid)).clone();
57+
let pkg = try!(pkg_set.get_one(pkgid)).clone();
5858

5959
let current_dir = try!(env::current_dir());
6060
let target_dir = PathBuf::from(current_dir).join("cratesfyi");
@@ -79,7 +79,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
7979

8080
// since https://github.com/rust-lang/rust/pull/51384, we can pass --extern-html-root-url to
8181
// force rustdoc to link to other docs.rs docs for dependencies
82-
let source = try!(source_cfg_map.load(&source_id));
82+
let source = try!(source_cfg_map.load(source_id));
8383
for (name, dep) in try!(resolve_deps(&pkg, &config, source)) {
8484
rustdoc_args.push("--extern-html-root-url".to_string());
8585
rustdoc_args.push(format!("{}=https://docs.rs/{}/{}",
@@ -118,7 +118,7 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
118118

119119
let ws = try!(Workspace::ephemeral(pkg, &config, Some(Filesystem::new(target_dir)), false));
120120
let exec: Arc<Executor> = Arc::new(DefaultExecutor);
121-
let source = try!(source_cfg_map.load(&source_id));
121+
let source = try!(source_cfg_map.load(source_id));
122122
try!(ops::compile_ws(&ws, Some(source), &opts, &exec));
123123

124124
Ok(try!(ws.current()).clone())
@@ -139,9 +139,9 @@ fn resolve_deps<'cfg>(pkg: &Package, config: &'cfg Config, src: Box<Source + 'cf
139139
None,
140140
false,
141141
));
142-
let dep_ids = resolver.deps(pkg.package_id()).map(|p| p.0).cloned().collect::<Vec<_>>();
142+
let dep_ids = resolver.deps(pkg.package_id()).map(|p| p.0).collect::<Vec<_>>();
143143
let pkg_set = try!(registry.get(&dep_ids));
144-
let deps = try!(pkg_set.get_many(&dep_ids));
144+
let deps = try!(pkg_set.get_many(dep_ids));
145145

146146
let mut ret = Vec::new();
147147
for dep in deps {
@@ -161,11 +161,11 @@ pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult<Package> {
161161
let source_id = try!(SourceId::crates_io(&config));
162162

163163
let source_map = try!(SourceConfigMap::new(&config));
164-
let mut source = try!(source_map.load(&source_id));
164+
let mut source = try!(source_map.load(source_id));
165165

166166
try!(source.update());
167167

168-
let dep = try!(Dependency::parse_no_deprecated(name, vers, &source_id));
168+
let dep = try!(Dependency::parse_no_deprecated(name, vers, source_id));
169169
let deps = try!(source.query_vec(&dep));
170170
let pkgid = try!(deps.iter().map(|p| p.package_id()).max()
171171
// FIXME: This is probably not a rusty way to handle options and results
@@ -177,7 +177,7 @@ pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult<Package> {
177177

178178
let pkg_set = try!(PackageSet::new(&[pkgid.clone()], source_map, &config));
179179

180-
let pkg = try!(pkg_set.get_one(&pkgid)).clone();
180+
let pkg = try!(pkg_set.get_one(pkgid)).clone();
181181

182182
Ok(pkg)
183183
}
@@ -189,7 +189,7 @@ pub fn update_sources() -> CargoResult<()> {
189189
let source_id = try!(SourceId::crates_io(&config));
190190

191191
let source_map = try!(SourceConfigMap::new(&config));
192-
let mut source = try!(source_map.load(&source_id));
192+
let mut source = try!(source_map.load(source_id));
193193

194194
source.update()
195195
}

0 commit comments

Comments
 (0)