Remove redundant mode param in gen_profile

Summary:
Profile mode is specified in `enable_profile` call, and passing it again in `gen_profile` is:
* redundant
* was not verified that it was passed consistently with param in `enable_profile`

Reviewed By: bobyangyf

Differential Revision: D38551069

fbshipit-source-id: 876944f88397a3cbc03eeecb6e4c89eb8bb96e9f

Author: stepancheg

starlark/src/eval/runtime/evaluator.rs

@@ -75,6 +75,10 @@ use crate::values::ValueLike;
 
 #[derive(Error, Debug)]
 pub(crate) enum EvaluatorError {
+    #[error("Profiling was not enabled")]
+    ProfilingNotEnabled,
+    #[error("Cannot generate profile because only profiling instrumentation enabled")]
+    InstrumentationEnabled,
     #[error("Can't call `write_heap_profile` unless you first call `enable_heap_profile`.")]
     HeapProfilingNotEnabled,
     #[error("Can't call `write_stmt_profile` unless you first call `enable_stmt_profile`.")]
@@ -296,20 +300,25 @@ impl<'v, 'a> Evaluator<'v, 'a> {
 
     /// Write a profile to a file.
     /// Only valid if corresponding profiler was enabled.
-    pub fn write_profile<P: AsRef<Path>>(
-        &self,
-        mode: &ProfileMode,
-        filename: P,
-    ) -> anyhow::Result<()> {
-        let profile = self.gen_profile(mode)?;
+    pub fn write_profile<P: AsRef<Path>>(&self, filename: P) -> anyhow::Result<()> {
+        let profile = self.gen_profile()?;
         fs::write(filename.as_ref(), profile)
             .with_context(|| format!("writing profile to `{}`", filename.as_ref().display()))?;
         Ok(())
     }
 
     /// Generate profile for a given mode.
     /// Only valid if corresponding profiler was enabled.
-    pub fn gen_profile(&self, mode: &ProfileMode) -> anyhow::Result<String> {
+    pub fn gen_profile(&self) -> anyhow::Result<String> {
+        let mode = match &self.profile_or_instrumentation_mode {
+            ProfileOrInstrumentationMode::None => {
+                return Err(EvaluatorError::ProfilingNotEnabled.into());
+            }
+            ProfileOrInstrumentationMode::Instrumentation(..) => {
+                return Err(EvaluatorError::InstrumentationEnabled.into());
+            }
+            ProfileOrInstrumentationMode::Profile(mode) => mode,
+        };
         match mode {
             ProfileMode::HeapSummary => self
                 .heap_profile