Skip to content

Rollup of 30 pull requests #35365

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

Merged
merged 73 commits into from
Aug 5, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e805cb6
Add io::Error doc examples
GuillaumeGomez Jul 29, 2016
aad5f6f
Add doc example for io::Stderr
GuillaumeGomez Jul 29, 2016
451683f
Add doc example for Stdin
GuillaumeGomez Jul 29, 2016
aeb3af8
Add doc example for Stdout
GuillaumeGomez Jul 29, 2016
2bed205
Add io::Take doc example
GuillaumeGomez Jul 30, 2016
fda473f
Add urls in std::io types
GuillaumeGomez Jul 30, 2016
b77b9b7
Provide more explicit example of wildcard version in guessing game doc.
jongiddy Jul 31, 2016
65e3ff4
add extended information for E0529, slice pattern expects array or slice
zackmdavis Jun 17, 2016
7093d1d
add extended info for E0527, slice pattern element count expectations
zackmdavis Jun 17, 2016
e960021
extended info for E0528, expected at least this-and-such many elements
zackmdavis Jun 17, 2016
157f7c1
Add Derive not possible question to Copy
Havvy Jul 26, 2016
57e3b9e
Indicate where the `std::net::Incoming` struct is created.
frewsxcv Aug 2, 2016
f2d8db1
Link to relevant method/struct for `std::net::Shutdown` docs.
frewsxcv Aug 2, 2016
3081dd8
Add doc example for `std::ffi::NulError::nul_position`.
frewsxcv Aug 2, 2016
727d929
Add doc examples for `range::RangeArgument::{start,end}`.
frewsxcv Jul 26, 2016
1fa9b8d
Add doc example for Vec
GuillaumeGomez Aug 2, 2016
d90c166
Update the-stack-and-the-heap.md
mLuby Aug 2, 2016
3e46c9d
Add doc examples for FileType struct
GuillaumeGomez Jul 27, 2016
d603892
Add span method for hir::Generics struct
GuillaumeGomez Aug 3, 2016
9b690c9
Update E0132 to new format
GuillaumeGomez Aug 3, 2016
4fc6f5a
Add an example to `std::thread::park_timeout`
dns2utf8 Aug 3, 2016
20721a4
Add link to replacement function
dns2utf8 Aug 3, 2016
1607d5b
Add note test for E0132
GuillaumeGomez Aug 3, 2016
c89e278
Update error message for E0109
circuitfox Aug 3, 2016
6131815
Fixes for issues #35215 and #35216
leikahing Aug 4, 2016
0e75684
Tidying up some of the line spacing / code formatting for NOTE/ERROR …
leikahing Aug 4, 2016
ded0d51
Removing trailing whitespace leftover from last re-formatting commit
leikahing Aug 4, 2016
7fc0b2f
Update E0079 to new format
Aug 4, 2016
ee8d6b0
Update error message for E0172
Aug 4, 2016
08ff7a8
Update error message E0178
Aug 4, 2016
eeda69f
Set label for unreachable pattern
saml Aug 4, 2016
034e659
Changing label to "this is an..."
saml Aug 4, 2016
7c58b26
Updated E0071 to new format.
razielgn Aug 3, 2016
5430e55
E0110 update error format
circuitfox Aug 4, 2016
a0bdb17
Update E0124 to the new error format
sciyoshi Aug 4, 2016
df726a4
Update error format for E0137
Aug 4, 2016
76babf9
Fix precedence table in reference
ubsan Aug 4, 2016
0214ec2
Update error format for E0062
trixnz Aug 4, 2016
2f36ecf
E0119 update error format
circuitfox Aug 4, 2016
b5b3539
Update compiler error E0055 to use new error format
nickmass Aug 4, 2016
3b2f184
Update error message E0120
Aug 4, 2016
1ca95ae
Fix for issue #35336 - updating error message for for E0368 to includ…
leikahing Aug 5, 2016
a6ffa42
Update E0391 to new format.
ryan-scott-dev Aug 5, 2016
19e140b
Update E0404 to new format.
ryan-scott-dev Aug 5, 2016
1bb5552
Rollup merge of #34319 - zackmdavis:explain_slice_pattern_errors, r=G…
GuillaumeGomez Aug 5, 2016
5afe7bb
Rollup merge of #35041 - frewsxcv:range-rangeargument, r=GuillaumeGomez
GuillaumeGomez Aug 5, 2016
4944952
Rollup merge of #35042 - Havvy:copy_error_doc, r=GuillaumeGomez
GuillaumeGomez Aug 5, 2016
56a89f5
Rollup merge of #35076 - GuillaumeGomez:file_type_docs, r=steveklabnik
GuillaumeGomez Aug 5, 2016
4cf6c00
Rollup merge of #35109 - GuillaumeGomez:io_docs, r=steveklabnik
GuillaumeGomez Aug 5, 2016
7971a93
Rollup merge of #35137 - jongiddy:explicit-wildcard, r=steveklabnik
GuillaumeGomez Aug 5, 2016
e377049
Rollup merge of #35175 - frewsxcv:tcp, r=GuillaumeGomez
GuillaumeGomez Aug 5, 2016
3ca18f7
Rollup merge of #35181 - GuillaumeGomez:vec_doc, r=steveklabnik
GuillaumeGomez Aug 5, 2016
8a923d4
Rollup merge of #35182 - frewsxcv:nulerror, r=steveklabnik
GuillaumeGomez Aug 5, 2016
6e5e7e2
Rollup merge of #35189 - mLuby:patch-1, r=steveklabnik
GuillaumeGomez Aug 5, 2016
5780595
Rollup merge of #35239 - dns2utf8:doc_park_timeout, r=steveklabnik
GuillaumeGomez Aug 5, 2016
158597f
Rollup merge of #35264 - GuillaumeGomez:E0132_update, r=jonathandturner
GuillaumeGomez Aug 5, 2016
9186db8
Rollup merge of #35266 - circuitfox:35247-E0109-update-error-format, …
GuillaumeGomez Aug 5, 2016
da981cf
Rollup merge of #35285 - razielgn:updated-e0071-to-new-format, r=jona…
GuillaumeGomez Aug 5, 2016
7cb933e
Rollup merge of #35289 - birryree:E0060_E0061_format_update, r=jonath…
GuillaumeGomez Aug 5, 2016
527e326
Rollup merge of #35291 - yossi-k:master, r=jonathandturner
GuillaumeGomez Aug 5, 2016
709fd09
Rollup merge of #35294 - Roybie:35272-E0172-update-error-format, r=jo…
GuillaumeGomez Aug 5, 2016
7a31640
Rollup merge of #35296 - medzin:master, r=jonathandturner
GuillaumeGomez Aug 5, 2016
8038c17
Rollup merge of #35297 - saml:e0001-label, r=jonathandturner
GuillaumeGomez Aug 5, 2016
65a283f
Rollup merge of #35298 - Keats:err-120, r=jonathandturner
GuillaumeGomez Aug 5, 2016
84d467c
Rollup merge of #35299 - circuitfox:E0110-update-error-format, r=jona…
GuillaumeGomez Aug 5, 2016
e9b79d9
Rollup merge of #35318 - sciyoshi:update-e0124, r=jonathandturner
GuillaumeGomez Aug 5, 2016
a7b443f
Rollup merge of #35319 - Keats:err-137, r=jonathandturner
GuillaumeGomez Aug 5, 2016
6597a28
Rollup merge of #35324 - ubsan:precedence, r=steveklabnik
GuillaumeGomez Aug 5, 2016
31da06b
Rollup merge of #35326 - circuitfox:E0119-update-error-format, r=jona…
GuillaumeGomez Aug 5, 2016
8b97008
Rollup merge of #35328 - trixnz:update-error-62, r=jonathandturner
GuillaumeGomez Aug 5, 2016
0339904
Rollup merge of #35333 - nickmass:e0055-formatting, r=jonathandturner
GuillaumeGomez Aug 5, 2016
dbef510
Rollup merge of #35350 - birryree:E0368_update, r=jonathandturner
GuillaumeGomez Aug 5, 2016
cd48161
Rollup merge of #35359 - Archytaus:master, r=GuillaumeGomez
GuillaumeGomez Aug 5, 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
Update error message for E0109
  • Loading branch information
circuitfox committed Aug 3, 2016
commit c89e27824f8f30e0c8dd153a9f6bb6a31ddfc65b
6 changes: 4 additions & 2 deletions src/librustc/middle/astconv_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
pub fn prohibit_type_params(self, segments: &[ast::PathSegment]) {
for segment in segments {
for typ in segment.parameters.types() {
span_err!(self.sess, typ.span, E0109,
"type parameters are not allowed on this type");
struct_span_err!(self.sess, typ.span, E0109,
"type parameters are not allowed on this type")
.span_label(typ.span, &format!("type parameter not allowed"))
.emit();
break;
}
for lifetime in segment.parameters.lifetimes() {
Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/E0109.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// except according to those terms.

type X = u32<i32>; //~ ERROR E0109
//~| NOTE type parameter not allowed

fn main() {
}