~john-koepi/ubuntu/trusty/golang/default

« back to all changes in this revision

Viewing changes to src/pkg/fmt/scan_test.go

  • Committer: Bazaar Package Importer
  • Author(s): Ondřej Surý
  • Date: 2011-08-03 17:04:59 UTC
  • mfrom: (14.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110803170459-wzd99m3567y80ila
Tags: 1:59-1
* Imported Upstream version 59
* Refresh patches to a new release
* Fix FTBFS on ARM (Closes: #634270)
* Update version.bash to work with Debian packaging and not hg
  repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
94
94
        }
95
95
        s := string(tok)
96
96
        if !regexp.MustCompile("^" + string(verb) + "+$").MatchString(s) {
97
 
                return os.ErrorString("syntax error for xs")
 
97
                return os.NewError("syntax error for xs")
98
98
        }
99
99
        *x = Xs(s)
100
100
        return nil
818
818
        next := new(RecursiveInt)
819
819
        _, err = Fscanf(state, ".%v", next)
820
820
        if err != nil {
821
 
                if err == os.ErrorString("input does not match format") || err == io.ErrUnexpectedEOF {
 
821
                if err == os.NewError("input does not match format") || err == io.ErrUnexpectedEOF {
822
822
                        err = nil
823
823
                }
824
824
                return