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 13 pull requests #32771

Closed
wants to merge 27 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ecc0bd2
Fix LLVM assert when handling bad intrinsic monomorphizations
Amanieu Mar 31, 2016
313eb32
Address FIXMEs related to short lifetimes in `HashMap`.
frewsxcv Apr 1, 2016
a2f6d29
Remove error description of `move`
tclfs Apr 2, 2016
da4d7f5
Indicate `None` is code-like in doc comment.
frewsxcv Apr 3, 2016
a09a3ac
Remove outdated comment
sanxiyn Apr 4, 2016
2325cab
minor: update old comments
matklad Apr 4, 2016
a447124
Mention that it's not actually a data race
Manishearth Mar 27, 2016
cfe25ad
Fix the span for try shorthand expressions
marcusklaas Apr 3, 2016
6fee337
Add example doc for ToOwned trait
GuillaumeGomez Apr 5, 2016
8f463ea
doc: make env::consts summaries less confusing
tshepang Apr 5, 2016
d841c15
Doc fix: function takes argument by reference.
Mar 31, 2016
a7d15ce
Doc fix: list all module files Rust looks for.
Mar 31, 2016
922e666
avoid "==" in assert! when one of the values is a bool
tshepang Apr 6, 2016
b27b3e1
change constant patterns to have a warning cycle
nikomatsakis Apr 6, 2016
c9168f7
Rollup merge of #31762 - tshepang:in-which-case, r=steveklabnik
steveklabnik Apr 6, 2016
e55834b
Rollup merge of #32538 - Manishearth:no-data-race, r=steveklabnik
steveklabnik Apr 6, 2016
e9774e7
Rollup merge of #32634 - varunvats:docs-fix, r=steveklabnik
steveklabnik Apr 6, 2016
0f7d73e
Rollup merge of #32649 - Amanieu:intrinsic_monomorphization_assert, r…
steveklabnik Apr 6, 2016
9c59d6b
Rollup merge of #32668 - frewsxcv:hashmap-address-fixme, r=alexcrichton
steveklabnik Apr 6, 2016
ec3917a
Rollup merge of #32679 - tclfs:patch-1, r=steveklabnik
steveklabnik Apr 6, 2016
b959fdc
Rollup merge of #32691 - frewsxcv:patch-28, r=alexcrichton
steveklabnik Apr 6, 2016
a2a2cfd
Rollup merge of #32711 - marcusklaas:try-shorthand-span-fix, r=nagisa
steveklabnik Apr 6, 2016
426d633
Rollup merge of #32724 - sanxiyn:outdated-comment, r=dotdash
steveklabnik Apr 6, 2016
ba97265
Rollup merge of #32727 - matklad:fix-comment, r=alexcrichton
steveklabnik Apr 6, 2016
f02a4b7
Rollup merge of #32744 - GuillaumeGomez:patch-3, r=steveklabnik
steveklabnik Apr 6, 2016
1e05e36
Rollup merge of #32761 - tshepang:assert, r=steveklabnik
steveklabnik Apr 6, 2016
d326734
Rollup merge of #32766 - nikomatsakis:constant-pattern-warning-cycle,…
steveklabnik Apr 6, 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
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
@@ -2576,7 +2576,7 @@ impl<'a> Parser<'a> {
loop {
// expr?
while self.eat(&token::Question) {
let hi = self.span.hi;
let hi = self.last_span.hi;
e = self.mk_expr(lo, hi, ExprKind::Try(e), None);
}

21 changes: 21 additions & 0 deletions src/test/compile-fail/symbol-names/issue-32709.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2016 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.

#![feature(question_mark)]

// Make sure that the span of try shorthand does not include the trailing
// semicolon;
fn test() -> Result<i32, ()> {
let x = Ok(1);
let y: Option<i32> = x?; //~ ERROR 17:26: 17:28
Ok(1)
}

fn main() {}