Skip to content

Commit 22c19f0

Browse files
committed
---
yaml --- r: 236403 b: refs/heads/auto c: 8fe79bd h: refs/heads/master i: 236401: 2264010 236399: 17a7d04 v: v3
1 parent 17d29fb commit 22c19f0

File tree

6 files changed

+33
-7
lines changed

6 files changed

+33
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 30fbf44fbc3d844c3e609bffa239151d5efcbccd
11+
refs/heads/auto: 8fe79bdfdacb2f5914971bd1a0b63b9577afbf6a
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/mk/grammar.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
5858
$(Q)$(SG)check.sh $(S) "$(BG)" \
5959
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
6060
else
61-
$(info cfg: grun not available, skipping lexer test...)
61+
$(info cfg: lexer tooling not available, skipping lexer test...)
6262
check-lexer:
6363

6464
endif
6565
else
66-
$(info cfg: antlr4 not available, skipping lexer test...)
66+
$(info cfg: lexer tooling not available, skipping lexer test...)
6767
check-lexer:
6868

6969
endif
7070
else
71-
$(info cfg: javac not available, skipping lexer test...)
71+
$(info cfg: lexer tooling not available, skipping lexer test...)
7272
check-lexer:
7373

7474
endif

branches/auto/src/liblibc/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1683,10 +1683,12 @@ pub mod types {
16831683
pub mod posix01 {
16841684
use types::common::c95::{c_void};
16851685
use types::common::c99::{uint32_t, uint64_t};
1686-
use types::os::arch::c95::{c_int, c_uint, c_long, time_t};
1686+
use types::os::arch::c95::{c_long, time_t};
16871687
use types::os::arch::posix88::{dev_t, gid_t};
16881688
use types::os::arch::posix88::{mode_t, off_t};
16891689
use types::os::arch::posix88::{uid_t};
1690+
#[cfg(target_os = "netbsd")]
1691+
use types::os::arch::c95::{c_int, c_uint};
16901692

16911693
pub type nlink_t = uint32_t;
16921694
pub type blksize_t = uint32_t;

branches/auto/src/librustc/middle/liveness.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,9 +1399,8 @@ fn check_arm(this: &mut Liveness, arm: &hir::Arm) {
13991399

14001400
fn check_expr(this: &mut Liveness, expr: &Expr) {
14011401
match expr.node {
1402-
hir::ExprAssign(ref l, ref r) => {
1402+
hir::ExprAssign(ref l, _) => {
14031403
this.check_lvalue(&**l);
1404-
this.visit_expr(&**r);
14051404

14061405
visit::walk_expr(this, expr);
14071406
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![deny(unused_variables)]
12+
13+
fn f(_: i32) {}
14+
15+
fn main() {
16+
let mut v = 0;
17+
f(v);
18+
v = match 0 { a => 0 }; //~ ERROR: unused variable: `a`
19+
f(v);
20+
}

branches/auto/src/test/run-make/tools.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ ifeq ($(UNAME),Bitrig)
8585
else
8686
ifeq ($(UNAME),OpenBSD)
8787
EXTRACFLAGS := -lm -lpthread
88+
# extend search lib for found estdc++ if build using gcc from
89+
# ports under OpenBSD. This is needed for:
90+
# - run-make/execution-engine
91+
# - run-make/issue-19371
92+
RUSTC := $(RUSTC) -L/usr/local/lib
8893
else
8994
EXTRACFLAGS := -lm -lrt -ldl -lpthread
9095
EXTRACXXFLAGS := -lstdc++

0 commit comments

Comments
 (0)