Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 14 pull requests #33354

Merged
merged 60 commits into from
May 3, 2016
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
3eef083
libsyntax/pp: minor modernizations
birkenfeld May 1, 2016
4186169
libsyntax/pp: replace manual ring buffer with a VecDeque
birkenfeld May 1, 2016
b51698a
match check: note "catchall" patterns in unreachable error
birkenfeld May 1, 2016
ffba7b7
typeck: remove confusing suggestion for calling a fn type
birkenfeld May 1, 2016
0e89f55
E0269: add suggestion to check for trailing semicolons
birkenfeld May 1, 2016
d20b406
diagnostics for E0432: imports are relative to crate root
birkenfeld May 1, 2016
9e23000
lexer: do not display char confusingly in error message
birkenfeld May 2, 2016
38c8836
docs: Changed docs for `size_of` to describe size as a stride offset
cramertj May 2, 2016
9fe3c06
libstd: correct the link to functions in io module documentation
Ryman May 2, 2016
a20ee76
revamp MultiSpan and introduce new snippet code
nikomatsakis Apr 20, 2016
e7c7a18
adapt JSON to new model
nikomatsakis Apr 20, 2016
5b150cf
add borrowck info inline in main snippet
nikomatsakis Apr 20, 2016
11dc974
refactor to use new snippet code and model
nikomatsakis Apr 20, 2016
d9a947c
use new `note_expected_found` API
nikomatsakis Apr 20, 2016
e416518
update test cases to reflect new messages
nikomatsakis Apr 20, 2016
1ff1887
thread tighter span for closures around
nikomatsakis Apr 20, 2016
489a6c9
replace fileline_{help,note} with {help,note}
nikomatsakis Apr 20, 2016
41a652e
WIP factor out RudimentaryEmitter
nikomatsakis Apr 20, 2016
71c6f81
change errors from Yellow to Magenta
nikomatsakis Apr 20, 2016
4714394
delete the json-errors test
nikomatsakis Apr 20, 2016
9d022f2
rewrite span-length to include strings
nikomatsakis Apr 20, 2016
1067850
refactor the Emitter trait
nikomatsakis Apr 21, 2016
8013eeb
fix error message in librustc_driver tests
nikomatsakis Apr 21, 2016
5adfe5b
Nit: comments should be uppercase letter
nikomatsakis Apr 26, 2016
9a9c9af
Fix whitespace
nikomatsakis Apr 26, 2016
e56121c
Do not import variants from RenderedLineKind
nikomatsakis Apr 26, 2016
d58a4be
Nit: do not import variants from Style
nikomatsakis Apr 26, 2016
d5529f0
Nit: do not use RLK
nikomatsakis Apr 26, 2016
f6496cd
Nit: address various style nits
nikomatsakis Apr 26, 2016
94841be
Nit: in emitter.rs
nikomatsakis Apr 26, 2016
24f4b15
Nit: use last_mut better
nikomatsakis Apr 26, 2016
1fdbfcd
only emit `^` at the start of a multi-line error
nikomatsakis Apr 26, 2016
883b969
Nit: add comment
nikomatsakis Apr 27, 2016
5db4d62
Nit: remove push_primary_span, which was never called
nikomatsakis Apr 27, 2016
ba12ed0
fix tests better
nikomatsakis Apr 27, 2016
8a9ad72
Nit: use Range::contains
nikomatsakis Apr 27, 2016
790043b
fix snippet tests MORE!
nikomatsakis Apr 27, 2016
89d086b
change color of warning to YELLOW
nikomatsakis Apr 27, 2016
49dfac4
move "lint level defined here" into secondary note
nikomatsakis Apr 27, 2016
84cb56f
Add back in a 'old school' error format
Apr 28, 2016
79f61a4
Finish up with 'old school' error mode
Apr 29, 2016
5974e5b
Fix up error-pattern style test
Apr 29, 2016
2ba5fac
fix rebase flaws
nikomatsakis Apr 29, 2016
95576b8
update unit tests
nikomatsakis Apr 30, 2016
64e0819
patch travis failure
nikomatsakis Apr 30, 2016
f359aa2
Fix unicode test to use original error format
sophiajt Apr 30, 2016
9d151a7
do not fail if len(rendered_lines) is == 1
nikomatsakis May 2, 2016
db8a9a9
avoid double panic
nikomatsakis May 2, 2016
71e6329
rustc: Handle concurrent `create_dir` requests
alexcrichton May 2, 2016
9355a91
assert we get at least two rendered lines back
nikomatsakis May 2, 2016
40199f6
Rollup merge of #32756 - nikomatsakis:borrowck-snippet, r=nrc
Manishearth May 2, 2016
308f10c
Rollup merge of #33309 - birkenfeld:pp, r=nrc
Manishearth May 2, 2016
1d6cc19
Rollup merge of #33320 - birkenfeld:issue31573, r=arielb1
Manishearth May 2, 2016
c4d950d
Rollup merge of #33323 - birkenfeld:issue-31221, r=Manishearth
Manishearth May 2, 2016
68c29e0
Rollup merge of #33324 - birkenfeld:issue-30497, r=GuillaumeGomez
Manishearth May 2, 2016
0ee84c7
Rollup merge of #33325 - birkenfeld:issue-31341, r=jseyfried
Manishearth May 2, 2016
7e88dc7
Rollup merge of #33332 - alexcrichton:handle-more-races, r=michaelwoe…
Manishearth May 2, 2016
ac19fdc
Rollup merge of #33334 - birkenfeld:issue29088, r=Manishearth
Manishearth May 2, 2016
d6c6bbf
Rollup merge of #33335 - cramertj:master, r=alexcrichton
Manishearth May 2, 2016
638cf9f
Rollup merge of #33346 - Ryman:patch-4, r=alexcrichton
Manishearth May 2, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Nit: in emitter.rs
  • Loading branch information
nikomatsakis committed May 2, 2016
commit 94841bea7b5753ba29655ce60a99f329e8eb8f24
3 changes: 1 addition & 2 deletions src/libsyntax/errors/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,7 @@ impl Destination {
style: Style)
-> io::Result<()> {
match style {
Style::FileNameStyle => {
}
Style::FileNameStyle |
Style::LineAndColumn => {
}
Style::LineNumber => {
Expand Down