diff --git a/build.sbt b/build.sbt index d9a77cfad60..1277bf8e561 100644 --- a/build.sbt +++ b/build.sbt @@ -1614,7 +1614,7 @@ lazy val `std-google-api` = project .settings( autoScalaLibrary := false, Compile / packageBin / artifactPath := - `google-api-polyglot-root` / "std-image.jar", + `google-api-polyglot-root` / "std-google-api.jar", libraryDependencies ++= Seq( "com.google.api-client" % "google-api-client" % "1.32.1", "com.google.apis" % "google-api-services-sheets" % "v4-rev612-1.25.0" diff --git a/engine/runtime/src/main/resources/Builtins.enso b/engine/runtime/src/main/resources/Builtins.enso index 5505e00ff7b..a6c491c77ff 100644 --- a/engine/runtime/src/main/resources/Builtins.enso +++ b/engine/runtime/src/main/resources/Builtins.enso @@ -341,7 +341,7 @@ type Panic program control flow. Panics "bubble up" through the program until they reach either an - invocation of Panic.catch or the program's main method. An unhandled + invocation of Panic.recover or the program's main method. An unhandled panic in main will terminate the program. ? Dataflow Errors or Panics @@ -365,7 +365,7 @@ type Panic ## Executes the provided action and converts any panic thrown by it into an Error. - If action executes successfully, the result of Panic.catch is the + If action executes successfully, the result of Panic.recover is the result of that action. Otherwise, it is the panic that was thrown after conversion to a dataflow error. @@ -377,7 +377,7 @@ type Panic Panic.recover (Panic.throw "Oh no!") recover : Any -> Any - recover ~action = @Builtin_Method "Panic.catch" + recover ~action = @Builtin_Method "Panic.recover" # Function types. type Function