gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Dustin J. Mitchell
2020-11-29 11:18:29 -05:00
parent 47cd051bd7
commit d832b0b859
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/cmd/debug.rs
View File

@@ -30,7 +30,7 @@ define_subcommand! {
subcommand_invocation! { subcommand_invocation! {
fn run(&self, command: &CommandInvocation) -> Fallible<()> { fn run(&self, command: &CommandInvocation) -> Fallible<()> {
let mut replica = command.get_replica(); let mut replica = command.get_replica()?;
let task = shared::get_task(&mut replica, &self.task)?; let task = shared::get_task(&mut replica, &self.task)?;
let mut t = Table::new(); let mut t = Table::new();

2
cli/src/cmd/start.rs
View File

@@ -28,7 +28,7 @@ define_subcommand! {
subcommand_invocation! { subcommand_invocation! {
fn run(&self, command: &CommandInvocation) -> Fallible<()> { fn run(&self, command: &CommandInvocation) -> Fallible<()> {
let mut replica = command.get_replica(); let mut replica = command.get_replica()?;
let task = shared::get_task(&mut replica, &self.task)?; let task = shared::get_task(&mut replica, &self.task)?;
task.into_mut(&mut replica).start()?; task.into_mut(&mut replica).start()?;
Ok(()) Ok(())

2
cli/src/cmd/stop.rs
View File

@@ -28,7 +28,7 @@ define_subcommand! {
subcommand_invocation! { subcommand_invocation! {
fn run(&self, command: &CommandInvocation) -> Fallible<()> { fn run(&self, command: &CommandInvocation) -> Fallible<()> {
let mut replica = command.get_replica(); let mut replica = command.get_replica()?;
let task = shared::get_task(&mut replica, &self.task)?; let task = shared::get_task(&mut replica, &self.task)?;
task.into_mut(&mut replica).stop()?; task.into_mut(&mut replica).stop()?;
Ok(()) Ok(())