diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-07 01:30:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 01:30:44 +0800 |
| commit | ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632 (patch) | |
| tree | 2b06aa1b360f1488264058d04e399e84b898f0d8 /console | |
| parent | 444fc892b0a860218dab3e421d92c33408b9eb6d (diff) | |
| parent | 13e3b2f433c48fe81423c1a13e9a5194ece61b01 (diff) | |
| download | dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.gz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.bz2 dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.lz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.xz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.zst dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.zip | |
Merge pull request #3525 from fjl/all-gosimple-cleanup
all: clean up lint issues, remove more dead code
Diffstat (limited to 'console')
| -rw-r--r-- | console/console.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/console/console.go b/console/console.go index 6e3d7e43c..8865f5e89 100644 --- a/console/console.go +++ b/console/console.go @@ -36,9 +36,9 @@ import ( ) var ( - passwordRegexp = regexp.MustCompile("personal.[nus]") - onlyWhitespace = regexp.MustCompile("^\\s*$") - exit = regexp.MustCompile("^\\s*exit\\s*;*\\s*$") + passwordRegexp = regexp.MustCompile(`personal.[nus]`) + onlyWhitespace = regexp.MustCompile(`^\s*$`) + exit = regexp.MustCompile(`^\s*exit\s*;*\s*$`) ) // HistoryFile is the file within the data directory to store input scrollback. @@ -275,10 +275,7 @@ func (c *Console) Evaluate(statement string) error { fmt.Fprintf(c.printer, "[native] error: %v\n", r) } }() - if err := c.jsre.Evaluate(statement, c.printer); err != nil { - return err - } - return nil + return c.jsre.Evaluate(statement, c.printer) } // Interactive starts an interactive user session, where input is propted from |