Skip to content

Commit ba5aac5

Browse files
borsbors
committed
Auto merge of #6896 - k-nasa:fix_fmt, r=ehuss
Run 'cargo fmt --all'
2 parents a6737f5 + 63a9c7a commit ba5aac5

File tree

20 files changed

+141
-109
lines changed

20 files changed

+141
-109
lines changed

‎src/cargo/core/compiler/build_context/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use std::str;
44

55
use log::debug;
66

7+
use crate::core::compiler::unit::UnitInterner;
8+
use crate::core::compiler::{BuildConfig, BuildOutput, Kind, Unit};
79
use crate::core::profiles::Profiles;
810
use crate::core::{Dependency, Workspace};
911
use crate::core::{PackageId, PackageSet, Resolve};
1012
use crate::util::errors::CargoResult;
1113
use crate::util::{profile, Cfg, Config, Rustc};
12-
use crate::core::compiler::{Unit, Kind, BuildConfig, BuildOutput};
13-
use crate::core::compiler::unit::UnitInterner;
1414

1515
mod target_info;
1616
pub use self::target_info::{FileFlavor, TargetInfo};

‎src/cargo/core/compiler/fingerprint.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,13 @@ impl Serialize for DepFingerprint {
422422
where
423423
S: ser::Serializer,
424424
{
425-
(&self.pkg_id, &self.name, &self.public, &self.fingerprint.hash()).serialize(ser)
425+
(
426+
&self.pkg_id,
427+
&self.name,
428+
&self.public,
429+
&self.fingerprint.hash(),
430+
)
431+
.serialize(ser)
426432
}
427433
}
428434

‎src/cargo/core/compiler/mod.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use log::debug;
2323
use same_file::is_same_file;
2424
use serde::Serialize;
2525

26-
use crate::core::Feature;
2726
pub use self::build_config::{BuildConfig, CompileMode, MessageFormat};
2827
pub use self::build_context::{BuildContext, FileFlavor, TargetConfig, TargetInfo};
2928
use self::build_plan::BuildPlan;
@@ -38,6 +37,7 @@ use self::output_depinfo::output_depinfo;
3837
pub use crate::core::compiler::unit::{Unit, UnitInterner};
3938
use crate::core::manifest::TargetSourcePath;
4039
use crate::core::profiles::{Lto, PanicStrategy, Profile};
40+
use crate::core::Feature;
4141
use crate::core::{PackageId, Target};
4242
use crate::util::errors::{CargoResult, CargoResultExt, Internal, ProcessError};
4343
use crate::util::paths;
@@ -984,15 +984,14 @@ fn build_deps_args<'a, 'cfg>(
984984
cmd.arg("-Z").arg("unstable-options");
985985
}
986986

987-
988987
return Ok(());
989988

990989
fn link_to<'a, 'cfg>(
991990
cmd: &mut ProcessBuilder,
992991
cx: &mut Context<'a, 'cfg>,
993992
current: &Unit<'a>,
994993
dep: &Unit<'a>,
995-
need_unstable_opts: &mut bool
994+
need_unstable_opts: &mut bool,
996995
) -> CargoResult<()> {
997996
let bcx = cx.bcx;
998997
for output in cx.outputs(dep)?.iter() {
@@ -1007,11 +1006,16 @@ fn build_deps_args<'a, 'cfg>(
10071006
v.push(&path::MAIN_SEPARATOR.to_string());
10081007
v.push(&output.path.file_name().unwrap());
10091008

1010-
if current.pkg.manifest().features().require(Feature::public_dependency()).is_ok() &&
1011-
!bcx.is_public_dependency(current, dep) {
1012-
1013-
cmd.arg("--extern-private");
1014-
*need_unstable_opts = true;
1009+
if current
1010+
.pkg
1011+
.manifest()
1012+
.features()
1013+
.require(Feature::public_dependency())
1014+
.is_ok()
1015+
&& !bcx.is_public_dependency(current, dep)
1016+
{
1017+
cmd.arg("--extern-private");
1018+
*need_unstable_opts = true;
10151019
} else {
10161020
cmd.arg("--extern");
10171021
}

‎src/cargo/core/resolver/resolve.rs

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use std::iter::FromIterator;
55

66
use url::Url;
77

8-
use crate::core::{Dependency, PackageId, PackageIdSpec, Summary, Target};
98
use crate::core::dependency::Kind;
9+
use crate::core::{Dependency, PackageId, PackageIdSpec, Summary, Target};
1010
use crate::util::errors::CargoResult;
1111
use crate::util::Graph;
1212

@@ -44,20 +44,29 @@ impl Resolve {
4444
unused_patches: Vec<PackageId>,
4545
) -> Resolve {
4646
let reverse_replacements = replacements.iter().map(|(&p, &r)| (r, p)).collect();
47-
let public_dependencies = graph.iter().map(|p| {
48-
let public_deps = graph.edges(p).flat_map(|(dep_package, deps)| {
49-
let id_opt: Option<PackageId> = deps.iter().find(|d| d.kind() == Kind::Normal).and_then(|d| {
50-
if d.is_public() {
51-
Some(dep_package.clone())
52-
} else {
53-
None
54-
}
55-
});
56-
id_opt
57-
}).collect::<HashSet<PackageId>>();
58-
59-
(p.clone(), public_deps)
60-
}).collect();
47+
let public_dependencies = graph
48+
.iter()
49+
.map(|p| {
50+
let public_deps = graph
51+
.edges(p)
52+
.flat_map(|(dep_package, deps)| {
53+
let id_opt: Option<PackageId> = deps
54+
.iter()
55+
.find(|d| d.kind() == Kind::Normal)
56+
.and_then(|d| {
57+
if d.is_public() {
58+
Some(dep_package.clone())
59+
} else {
60+
None
61+
}
62+
});
63+
id_opt
64+
})
65+
.collect::<HashSet<PackageId>>();
66+
67+
(p.clone(), public_deps)
68+
})
69+
.collect();
6170

6271
Resolve {
6372
graph,
@@ -68,7 +77,7 @@ impl Resolve {
6877
unused_patches,
6978
empty_features: HashSet::new(),
7079
reverse_replacements,
71-
public_dependencies
80+
public_dependencies,
7281
}
7382
}
7483

@@ -217,7 +226,8 @@ unable to verify that `{0}` is the same as when the lockfile was generated
217226
}
218227

219228
pub fn is_public_dep(&self, pkg: PackageId, dep: PackageId) -> bool {
220-
self.public_dependencies.get(&pkg)
229+
self.public_dependencies
230+
.get(&pkg)
221231
.map(|public_deps| public_deps.contains(&dep))
222232
.unwrap_or_else(|| panic!("Unknown dependency {:?} for package {:?}", dep, pkg))
223233
}

‎src/cargo/core/workspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use url::Url;
1111
use crate::core::features::Features;
1212
use crate::core::profiles::Profiles;
1313
use crate::core::registry::PackageRegistry;
14-
use crate::core::{Dependency, PackageIdSpec, PackageId};
14+
use crate::core::{Dependency, PackageId, PackageIdSpec};
1515
use crate::core::{EitherManifest, Package, SourceId, VirtualManifest};
1616
use crate::ops;
1717
use crate::sources::PathSource;

‎src/cargo/ops/cargo_compile.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,9 @@ fn generate_targets<'a>(
697697
} => {
698698
if *lib != LibRule::False {
699699
let mut libs = Vec::new();
700-
for proposal in filter_targets(packages, Target::is_lib, false, bcx.build_config.mode) {
700+
for proposal in
701+
filter_targets(packages, Target::is_lib, false, bcx.build_config.mode)
702+
{
701703
let Proposal { target, pkg, .. } = proposal;
702704
if bcx.build_config.mode == CompileMode::Doctest && !target.doctestable() {
703705
ws.config().shell().warn(format!(

‎src/cargo/ops/cargo_package.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ use termcolor::Color;
1515

1616
use crate::core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor};
1717
use crate::core::resolver::Method;
18+
use crate::core::Feature;
1819
use crate::core::{
1920
Package, PackageId, PackageIdSpec, PackageSet, Resolve, Source, SourceId, Verbosity, Workspace,
2021
};
21-
use crate::core::Feature;
2222
use crate::ops;
2323
use crate::sources::PathSource;
2424
use crate::util::errors::{CargoResult, CargoResultExt};
@@ -591,7 +591,12 @@ fn run_verify(ws: &Workspace<'_>, tar: &FileLock, opts: &PackageOpts<'_>) -> Car
591591
let pkg_fingerprint = hash_all(&dst)?;
592592
let ws = Workspace::ephemeral(new_pkg, config, None, true)?;
593593

594-
let rustc_args = if pkg.manifest().features().require(Feature::public_dependency()).is_ok() {
594+
let rustc_args = if pkg
595+
.manifest()
596+
.features()
597+
.require(Feature::public_dependency())
598+
.is_ok()
599+
{
595600
// FIXME: Turn this on at some point in the future
596601
//Some(vec!["-D exported_private_dependencies".to_string()])
597602
None

‎src/cargo/ops/registry.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
6969
opts.index.clone(),
7070
opts.registry.clone(),
7171
true,
72-
!opts.dry_run
72+
!opts.dry_run,
7373
)?;
7474
verify_dependencies(pkg, &registry, reg_id)?;
7575

@@ -326,7 +326,9 @@ pub fn registry_configuration(
326326
None => {
327327
// Checking for default index and token
328328
(
329-
config.get_default_registry_index()?.map(|url| url.to_string()),
329+
config
330+
.get_default_registry_index()?
331+
.map(|url| url.to_string()),
330332
config.get_string("registry.token")?.map(|p| p.val),
331333
)
332334
}
@@ -341,7 +343,7 @@ fn registry(
341343
index: Option<String>,
342344
registry: Option<String>,
343345
force_update: bool,
344-
validate_token: bool
346+
validate_token: bool,
345347
) -> CargoResult<(Registry, SourceId)> {
346348
// Parse all configuration options
347349
let RegistryConfig {
@@ -609,7 +611,7 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
609611
opts.index.clone(),
610612
opts.registry.clone(),
611613
true,
612-
true
614+
true,
613615
)?;
614616

615617
if let Some(ref v) = opts.to_add {

‎src/cargo/ops/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use std::rc::Rc;
33

44
use log::{debug, trace};
55

6-
use crate::core::Feature;
76
use crate::core::registry::PackageRegistry;
87
use crate::core::resolver::{self, Method, Resolve};
8+
use crate::core::Feature;
99
use crate::core::{PackageId, PackageIdSpec, PackageSet, Source, SourceId, Workspace};
1010
use crate::ops;
1111
use crate::sources::PathSource;

‎src/cargo/sources/registry/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ struct RegistryDependency<'a> {
285285
kind: Option<Cow<'a, str>>,
286286
registry: Option<Cow<'a, str>>,
287287
package: Option<Cow<'a, str>>,
288-
public: Option<bool>
288+
public: Option<bool>,
289289
}
290290

291291
impl<'a> RegistryDependency<'a> {
@@ -301,7 +301,7 @@ impl<'a> RegistryDependency<'a> {
301301
kind,
302302
registry,
303303
package,
304-
public
304+
public,
305305
} = self;
306306

307307
let id = if let Some(registry) = &registry {

0 commit comments

Comments
 (0)