Skip to content

Rollup of 13 pull requests #44474

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 26 commits into from
Sep 10, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
51a478c
rustc: Separately feature gate repr(i128)
alexcrichton Sep 2, 2017
258ec30
Expect pipe symbol after closure parameter lists
tirr-c Sep 5, 2017
0573949
Fixup some nits from #44238
nrc Sep 5, 2017
502e707
Reduce false positives number in rustdoc html diff
GuillaumeGomez Sep 5, 2017
5b76b86
Use memalign instead of posix_memalign for Solaris
bgermann Sep 6, 2017
f633284
std: Fix a segfault on OSX with backtraces
alexcrichton Sep 7, 2017
fc44447
Update the libcompiler_builins submodule
est31 Sep 7, 2017
ddb072b
std::thread::LocalKey: Document limitation with initializers
joshlf Sep 7, 2017
3e8fadc
Add doc example to String::as_str
tommyip Sep 9, 2017
967c4e6
Fix bitrotted generator panic emission
Zoxc Sep 9, 2017
6c89935
Add doc examples for str::as_bytes_mut
napen123 Sep 9, 2017
4928d25
add test for #41229
Dushistov Sep 9, 2017
c430fa8
documentation update to demonstrate mutability
Sep 9, 2017
9af7de1
Rollup merge of #44262 - alexcrichton:repr-128-gate, r=nikomatsakis
GuillaumeGomez Sep 10, 2017
078e1c5
Rollup merge of #44329 - nrc:pulldown-warn-fix, r=ollie27
GuillaumeGomez Sep 10, 2017
62659eb
Rollup merge of #44332 - tirr-c:issue-44021, r=petrochenkov
GuillaumeGomez Sep 10, 2017
65fd1a2
Rollup merge of #44347 - GuillaumeGomez:rustdoc-false-positive, r=Qui…
GuillaumeGomez Sep 10, 2017
1e4ab87
Rollup merge of #44372 - bgermann:master, r=alexcrichton
GuillaumeGomez Sep 10, 2017
0e2dac7
Rollup merge of #44384 - alexcrichton:osx-segfault, r=estebank
GuillaumeGomez Sep 10, 2017
06f39fa
Rollup merge of #44387 - est31:update_compiler_builtins, r=Mark-Simul…
GuillaumeGomez Sep 10, 2017
f76f2c7
Rollup merge of #44396 - joshlf:tls-comment, r=alexcrichton
GuillaumeGomez Sep 10, 2017
d3ef39f
Rollup merge of #44449 - tommyip:doc_string_as_str, r=frewsxcv
GuillaumeGomez Sep 10, 2017
485847d
Rollup merge of #44451 - Zoxc:gen-panic, r=eddyb
GuillaumeGomez Sep 10, 2017
329ed4a
Rollup merge of #44457 - napen123:master, r=frewsxcv
GuillaumeGomez Sep 10, 2017
dcc1d14
Rollup merge of #44464 - Dushistov:master, r=alexcrichton
GuillaumeGomez Sep 10, 2017
8a7d93b
Rollup merge of #44467 - toidiu:ak-44382, r=frewsxcv
GuillaumeGomez Sep 10, 2017
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
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4699,7 +4699,7 @@ impl<'a> Parser<'a> {
SeqSep::trailing_allowed(token::Comma),
|p| p.parse_fn_block_arg()
);
self.bump();
self.expect(&token::BinOp(token::Or))?;
args
}
};
Expand Down
16 changes: 16 additions & 0 deletions src/test/compile-fail/issue-44021.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct MyStruct;
impl MyStruct {
fn f() {|x, y} //~ ERROR expected one of `:`, `@`, or `|`, found `}`
}

fn main() {}