Merge branch 'master' into master

Author: Jakub Konka

src/lib.rs

@@ -24,7 +24,7 @@
 //! js: &[0u8; 100], // JavaScript file generated by Emscripten
 //! wasm: &[0u8; 100], // Wasm binary generated by Emscripten
 //! };
-//! let task = TaskBuilder::new("workspace", binary)
+//! let task = TaskBuilder::try_new("workspace", binary)?
 //! .push_subtask_data(vec![0u8; 100])
 //! .build()?;
 //! let computed_task = compute(

src/task.rs

@@ -41,7 +41,7 @@ pub struct GWasmBinary<'a> {
 /// wasm: &[],
 /// };
 /// let workspace = tempdir().unwrap();
-/// let task = TaskBuilder::new(&workspace, binary).build();
+/// let task = TaskBuilder::try_new(&workspace, binary).unwrap().build();
 /// assert!(task.is_ok());
 /// assert!(task.unwrap().options().subtasks().next().is_none());
 /// ```
@@ -66,6 +66,10 @@ pub struct TaskBuilder<'a> {
 
 impl<'a> TaskBuilder<'a> {
  /// Creates new `TaskBuilder` from workspace `Path` and `GWasmBinary`
+ #[deprecated(
+ since = "0.3.0",
+ note = "Use try_new instead, which properly handles relative paths"
+ )]
  pub fn new<P: AsRef<Path>>(workspace: P, binary: GWasmBinary<'a>) -> Self {
  Self {
  binary,
@@ -81,6 +85,13 @@ impl<'a> TaskBuilder<'a> {
  }
  }
 
+ /// Creates new `TaskBuilder` from workspace `Path` and `GWasmBinary`
+ pub fn try_new<P: AsRef<Path>>(workspace: P, binary: GWasmBinary<'a>) -> Result<Self> {
+ let abspath = workspace.as_ref().canonicalize()?;
+ #[allow(deprecated)]
+ Ok(Self::new(abspath, binary))
+ }
+
  /// Sets task's name
  pub fn name<S: AsRef<str>>(mut self, name: S) -> Self {
  self.name = Some(name.as_ref().to_owned());
@@ -226,7 +237,7 @@ impl<'a> TaskBuilder<'a> {
 /// wasm: &[],
 /// };
 /// let workspace = tempdir().unwrap();
-/// let task = TaskBuilder::new(&workspace, binary).build().unwrap();
+/// let task = TaskBuilder::try_new(&workspace, binary).unwrap().build().unwrap();
 /// let json_manifest = json!(task);
 /// ```
 ///
@@ -432,7 +443,7 @@ impl Subtask {
 /// wasm: &[],
 /// };
 /// let workspace = tempdir().unwrap();
-/// let task = TaskBuilder::new(&workspace, binary).build().unwrap();
+/// let task = TaskBuilder::try_new(&workspace, binary).unwrap().build().unwrap();
 /// let computed_task: Result<ComputedTask, _> = task.try_into();
 ///
 /// assert!(computed_task.is_ok());