diff options
| author | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
| commit | 59ccba995de202fb9d9a8d795d2770fb2d199db0 (patch) | |
| tree | c3fb8fc436dc758eb7b2d7c6ddf438225671c3c0 /src/libsyntax | |
| parent | dd39ecf368a3cdb937e129f36a2a342d0c9358f0 (diff) | |
| parent | 235fb23e553db0af9ac6e7d134a9f5a35bdf6619 (diff) | |
| download | rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.tar.gz rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.zip | |
Auto merge of #43939 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #43891, #43905, #43912, #43914, #43915, #43916, #43920, #43928, #43930 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/json.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index 19238c30670..37a59411c16 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -11,7 +11,7 @@ //! A JSON emitter for errors. //! //! This works by converting errors to a simplified structural format (see the -//! structs at the start of the file) and then serialising them. These should +//! structs at the start of the file) and then serializing them. These should //! contain as much information about the error as possible. //! //! The format of the JSON output should be considered *unstable*. For now the |