diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-01-07 09:23:01 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-01-15 14:49:25 +1300 |
| commit | 82f8e5ce84c83b02fbfa720c6841f12db1a55603 (patch) | |
| tree | 8ff7529affbf9c7906469fbe37899bef7ef975a2 /src/test | |
| parent | 11dcb48c6a99e84952de3b7d5c1f6928d7b05867 (diff) | |
| download | rust-82f8e5ce84c83b02fbfa720c6841f12db1a55603.tar.gz rust-82f8e5ce84c83b02fbfa720c6841f12db1a55603.zip | |
Address reviewer comments
[breaking-change] `OptLevel` variants are no longer `pub use`ed by rust::session::config. If you are using these variants, you must change your code to prefix the variant name with `OptLevel`.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/json-errors/Makefile | 5 | ||||
| -rw-r--r-- | src/test/run-make/json-errors/foo.rs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/test/run-make/json-errors/Makefile b/src/test/run-make/json-errors/Makefile index 2c1eae81150..2467e08300c 100644 --- a/src/test/run-make/json-errors/Makefile +++ b/src/test/run-make/json-errors/Makefile @@ -3,5 +3,6 @@ all: cp foo.rs $(TMPDIR) cd $(TMPDIR) - $(RUSTC) -Z unstable-options --output=json foo.rs 2>foo.log || true - grep -q '{"message":"unresolved name `y`","code":{"code":"E0425","explanation":"\\nAn unresolved name was used. Example of erroneous codes.*"},"level":"error","span":{"file_name":"foo.rs","byte_start":523,"byte_end":524,"line_start":14,"line_end":14,"column_start":18,"column_end":19},"children":\[\]}' foo.log + -$(RUSTC) -Z unstable-options --error-format=json foo.rs 2>foo.log + grep -q '{"message":"unresolved name `y`","code":{"code":"E0425","explanation":"\\nAn unresolved name was used. Example of erroneous codes.*"},"level":"error","span":{"file_name":"foo.rs","byte_start":496,"byte_end":497,"line_start":12,"line_end":12,"column_start":18,"column_end":19},"children":\[\]}' foo.log + grep -q '{"message":".*","code":{"code":"E0277","explanation":"\\nYou tried.*"},"level":"error","span":{.*},"children":\[{"message":"the .*","code":null,"level":"help","span":{"file_name":"foo.rs","byte_start":504,"byte_end":516,"line_start":14,"line_end":14,"column_start":0,"column_end":0},"children":\[\]},{"message":" <u8 as core::ops::Add>","code":null,"level":"help",' foo.log diff --git a/src/test/run-make/json-errors/foo.rs b/src/test/run-make/json-errors/foo.rs index 9a6f4ad8359..4db33940d88 100644 --- a/src/test/run-make/json-errors/foo.rs +++ b/src/test/run-make/json-errors/foo.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-tidy-linelength - fn main() { let x = 42 + y; + + 42u8 + 42i32; } |