Clean up lib_or_check_profile code

mbrubeck · mbrubeck · commit 9bb9dbd3c331 · 2018-02-05T10:46:20.000-08:00
diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
@@ -1055,14 +1055,12 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
     }
 
     pub fn lib_or_check_profile(&self, unit: &Unit, target: &Target) -> &'a Profile {
-        if unit.profile.check && !target.is_custom_build() && !target.for_host() {
-            &self.profiles.check
-        } else if unit.profile.doc && !unit.profile.test &&
-                !target.is_custom_build() && !target.for_host() {
-            &self.profiles.check
-        } else {
-            self.lib_profile()
+        if !target.is_custom_build() && !target.for_host() {
+            if unit.profile.check || (unit.profile.doc && !unit.profile.test) {
+                return &self.profiles.check
+            }
         }
+        self.lib_profile()
     }
 
     pub fn build_script_profile(&self, _pkg: &PackageId) -> &'a Profile {

Original file line number	Diff line number	Diff line change
`@@ -1055,14 +1055,12 @@ impl<'a, 'cfg> Context<'a, 'cfg> {`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`	`1057`	`pub fn lib_or_check_profile(&self, unit: &Unit, target: &Target) -> &'a Profile {`
`1058`		`- if unit.profile.check && !target.is_custom_build() && !target.for_host() {`
`1059`		`- &self.profiles.check`
`1060`		`- } else if unit.profile.doc && !unit.profile.test &&`
`1061`		`- !target.is_custom_build() && !target.for_host() {`
`1062`		`- &self.profiles.check`
`1063`		`- } else {`
`1064`		`- self.lib_profile()`
	`1058`	`+ if !target.is_custom_build() && !target.for_host() {`
	`1059`	`+ if unit.profile.check \|\| (unit.profile.doc && !unit.profile.test) {`
	`1060`	`+ return &self.profiles.check`
	`1061`	`+ }`
`1065`	`1062`	`}`
	`1063`	`+ self.lib_profile()`
`1066`	`1064`	`}`
`1067`	`1065`
`1068`	`1066`	`pub fn build_script_profile(&self, _pkg: &PackageId) -> &'a Profile {`