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 33 pull requests #35665

Closed
wants to merge 74 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
e91b625
Fix typo (privledge->privilege)
Jul 20, 2016
1403df7
Implement From for Cell, RefCell and UnsafeCell
malbarbo Aug 5, 2016
9d6fa40
Add regression test for #22894.
frewsxcv Aug 8, 2016
127489a
Update compiler error 0093 to use new error format
stanislav-tkach Aug 9, 2016
1a6fac7
E0248 Change in issue format
shyamsundarb-arch Aug 7, 2016
5c2c19a
Update error message for E0253 #35512
lukehinds Aug 9, 2016
5dac93d
[emscripten] Disable jemalloc for emscripten
badboy Aug 6, 2016
ad91873
[emscripten] Ignore tests
badboy Aug 8, 2016
60599df
[emscripten] Disable code paths that don't work on emscripten
badboy Aug 8, 2016
c974749
Update E0253.rs
lukehinds Aug 10, 2016
ae58a87
add -mrelax-relocations=no to i686-musl and i586-gnu
Aug 10, 2016
16cc8a7
Implemented a smarter concatenation system that will hopefully produc…
cgswords Aug 2, 2016
92f7e85
Update E0138 to new format
wdv4758h Aug 10, 2016
4b54dd7
Use an existing constant name as an example.
Antti Aug 11, 2016
b9762f8
Update E0033 to the new error format
munyari Aug 8, 2016
c0ff3c1
fix match
Aug 11, 2016
b707a12
Allow compiling against a custom LLVM 3.9 installation
shepmaster Aug 11, 2016
1c37892
Update E0220 message to new format
chamoysvoice Aug 6, 2016
80beeb3
Add additional error note
munyari Aug 11, 2016
4209f94
Add label to E0254
tvladyslav Aug 10, 2016
045c8c8
std: Optimize panic::catch_unwind slightly
alexcrichton Jul 9, 2016
c99c2ea
doc: a value of type `&str` is called a "string slice"
tshepang Aug 11, 2016
071410b
string: remove needless binding
tshepang Aug 11, 2016
c761184
Fix tidy tests
tvladyslav Aug 11, 2016
d099e30
Introduce `as_slice` method on `std::vec::IntoIter` struct.
frewsxcv Aug 7, 2016
01a766e
Introduce `as_mut_slice` method on `std::vec::IntoIter` struct.
frewsxcv Aug 7, 2016
fc97b5c
Change stabilization version of no_std from 1.0 to 1.6.
Mark-Simulacrum Aug 11, 2016
629f2aa
Fix typo
Aug 11, 2016
4224737
Improve &-ptr printing
Aug 12, 2016
f76a737
Correct span for pub_restricted field
sanxiyn Aug 8, 2016
3042fba
book: fix the hidden find() functions in error-handling.md
cvubrugier Aug 12, 2016
bfca761
fix small typos in std::convert documentation
matthew-piziak Aug 12, 2016
4ab00e4
updated E0070 to new error format
clementmiao Aug 12, 2016
302a423
Update E0301 to the new format
krzysztofgarczynski Aug 12, 2016
5402d28
Update E0302 to the new format
krzysztofgarczynski Aug 13, 2016
08e470f
compiletest: Remove dead code.
ahmedcharles Aug 13, 2016
bd90a16
updated E0067 to new error format
clementmiao Aug 13, 2016
85388f0
E0094 error message updated
theypsilon Aug 13, 2016
6fbff4f
Ensure that attributes are spelled properly.
ahmedcharles Aug 13, 2016
ab00b94
Predicates haven't existed in almost 5 years.
ahmedcharles Aug 13, 2016
10fce6e
Fix a couple of typos in RawVec
IvanUkhov Aug 14, 2016
db25536
Rollup merge of #34941 - qolop:patch-2, r=apasel422
eddyb Aug 14, 2016
eb1071f
Rollup merge of #35346 - DarkEld3r:e0093-formatting, r=jonathandturner
eddyb Aug 14, 2016
36335a1
Rollup merge of #35392 - malbarbo:cell-from, r=brson
eddyb Aug 14, 2016
1b324b0
Rollup merge of #35412 - chamoysvoice:e0220, r=jonathandturner
eddyb Aug 14, 2016
01f70ed
Rollup merge of #35444 - alexcrichton:optimize-catch-unwind, r=brson
eddyb Aug 14, 2016
46a8059
Rollup merge of #35447 - frewsxcv:vec-into-iter-as-slice, r=alexcrichton
eddyb Aug 14, 2016
9f87b1f
Rollup merge of #35491 - sanxiyn:pub-restricted-span, r=nikomatsakis
eddyb Aug 14, 2016
45c3b4c
Rollup merge of #35526 - munyari:e0033, r=jonathandturner
eddyb Aug 14, 2016
ffdc236
Rollup merge of #35533 - frewsxcv:22984, r=brson
eddyb Aug 14, 2016
fcf21f3
Rollup merge of #35539 - cgswords:ts_concat, r=nrc
eddyb Aug 14, 2016
79c3dd4
Rollup merge of #35558 - lukehinds:master, r=nikomatsakis
eddyb Aug 14, 2016
5b7488a
Rollup merge of #35573 - wdv4758h:E0138, r=jonathandturner
eddyb Aug 14, 2016
524bdb5
Rollup merge of #35574 - badboy:emscripten-test-fixes, r=brson
eddyb Aug 14, 2016
4d6a553
Rollup merge of #35577 - japaric:relax, r=alexcrichton
eddyb Aug 14, 2016
195558f
Rollup merge of #35586 - shyaamsundhar:SqushCom, r=jonathandturner
eddyb Aug 14, 2016
c4517f4
Rollup merge of #35588 - Antti:fix-atomics-docs, r=alexcrichton
eddyb Aug 14, 2016
840554e
Rollup merge of #35594 - shepmaster:configure-llvm-39, r=alexcrichton
eddyb Aug 14, 2016
15d3bb0
Rollup merge of #35596 - crypto-universe:E0254_style_and_tests, r=jon…
eddyb Aug 14, 2016
4ab8208
Rollup merge of #35597 - tshepang:it-is-a-slice, r=steveklabnik
eddyb Aug 14, 2016
c21bbba
Rollup merge of #35598 - tshepang:needless-binding, r=steveklabnik
eddyb Aug 14, 2016
7f13e5d
Rollup merge of #35606 - Mark-Simulacrum:no-std-fix, r=brson
eddyb Aug 14, 2016
0053012
Rollup merge of #35611 - jonathandturner:ptr-helper, r=nikomatsakis
eddyb Aug 14, 2016
d89a457
Rollup merge of #35615 - clementmiao:E0070_new_error_format, r=jonath…
eddyb Aug 14, 2016
5a89529
Rollup merge of #35616 - clementmiao:E0067_new_error_format, r=jonath…
eddyb Aug 14, 2016
e95ff85
Rollup merge of #35620 - cvubrugier:master, r=Manishearth
eddyb Aug 14, 2016
e41ff7f
Rollup merge of #35622 - matthew-piziak:convert-docs-typos, r=apasel422
eddyb Aug 14, 2016
09d8b9e
Rollup merge of #35640 - ahmedcharles:dead, r=alexcrichton
eddyb Aug 14, 2016
fc54ee2
Rollup merge of #35643 - garekkream:update-E0301-new-error-format, r=…
eddyb Aug 14, 2016
cd9918e
Rollup merge of #35644 - garekkream:update-E0302-new-error-format, r=…
eddyb Aug 14, 2016
e0cffcd
Rollup merge of #35646 - theypsilon:master, r=jonathandturner
eddyb Aug 14, 2016
320c65f
Rollup merge of #35647 - ahmedcharles:spelling, r=alexcrichton
eddyb Aug 14, 2016
d5ec6bd
Rollup merge of #35648 - ahmedcharles:pred, r=alexcrichton
eddyb Aug 14, 2016
d71e4e4
Rollup merge of #35661 - IvanUkhov:raw-vec, r=alexcrichton
eddyb Aug 14, 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
9 changes: 7 additions & 2 deletions src/librustc/middle/entry.rs
Original file line number Diff line number Diff line change
@@ -132,8 +132,13 @@ fn find_item(item: &Item, ctxt: &mut EntryContext, at_root: bool) {
if ctxt.start_fn.is_none() {
ctxt.start_fn = Some((item.id, item.span));
} else {
span_err!(ctxt.session, item.span, E0138,
"multiple 'start' functions");
struct_span_err!(
ctxt.session, item.span, E0138,
"multiple 'start' functions")
.span_label(ctxt.start_fn.unwrap().1,
&format!("previous `start` function here"))
.span_label(item.span, &format!("multiple `start` functions"))
.emit();
}
},
EntryPointType::None => ()
5 changes: 4 additions & 1 deletion src/test/compile-fail/E0138.rs
Original file line number Diff line number Diff line change
@@ -12,6 +12,9 @@

#[start]
fn foo(argc: isize, argv: *const *const u8) -> isize {}
//~^ NOTE previous `start` function here

#[start]
fn f(argc: isize, argv: *const *const u8) -> isize {} //~ ERROR E0138
fn f(argc: isize, argv: *const *const u8) -> isize {}
//~^ ERROR E0138
//~| NOTE multiple `start` functions