Skip to content

Commit 1c1bb20

Browse files
nrcnrc
committed
---
yaml --- r: 173751 b: refs/heads/auto c: 98d4711 h: refs/heads/master i: 173749: e0920b1 173747: 55bb4f1 173743: 0d10ac7 v: v3
1 parent 5dc041d commit 1c1bb20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1139
-1318
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 9ade482b3bdc7a967ca98f1f1138b596ef45191e
13+
refs/heads/auto: 98d471120a09607ad429bebf56c97b512bdf9847
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/configure

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,6 @@ case $CFG_CPUTYPE in
448448
CFG_CPUTYPE=aarch64
449449
;;
450450

451-
powerpc)
452-
CFG_CPUTYPE=powerpc
453-
;;
454-
455451
x86_64 | x86-64 | x64 | amd64)
456452
CFG_CPUTYPE=x86_64
457453
;;
@@ -1008,7 +1004,7 @@ do
10081004
make_dir $t/rt/jemalloc
10091005
for i in \
10101006
isaac sync test \
1011-
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
1007+
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips
10121008
do
10131009
make_dir $t/rt/stage$s/$i
10141010
done
@@ -1173,7 +1169,7 @@ do
11731169

11741170
msg "configuring LLVM for $gnu_t"
11751171

1176-
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,aarch64,mips,powerpc"
1172+
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,aarch64,mips"
11771173
LLVM_BUILD="--build=$gnu_t"
11781174
LLVM_HOST="--host=$gnu_t"
11791175
LLVM_TARGET="--target=$gnu_t"

‎branches/auto/mk/cfg/powerpc-unknown-linux-gnu.mk

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎branches/auto/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ endif
263263
######################################################################
264264

265265
# FIXME: x86-ism
266-
LLVM_COMPONENTS=x86 arm aarch64 mips powerpc ipo bitreader bitwriter linker asmparser mcjit \
266+
LLVM_COMPONENTS=x86 arm aarch64 mips ipo bitreader bitwriter linker asmparser mcjit \
267267
interpreter instrumentation
268268

269269
# Only build these LLVM tools

‎branches/auto/mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ define CFG_MAKE_TOOLCHAIN
177177
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
178178
$$(call CFG_INSTALL_NAME_$(1),$$(4))
179179

180-
ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel powerpc),)
180+
ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel),)
181181

182182
# We're using llvm-mc as our assembler because it supports
183183
# .cfi pseudo-ops on mac
@@ -189,7 +189,7 @@ define CFG_MAKE_TOOLCHAIN
189189
-o=$$(1)
190190
else
191191

192-
# For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler
192+
# For the ARM, AARCH64 and MIPS crosses, use the toolchain assembler
193193
# FIXME: We should be able to use the LLVM assembler
194194
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
195195
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)

‎branches/auto/src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2170,7 +2170,7 @@ arbitrarily complex configurations through nesting.
21702170
The following configurations must be defined by the implementation:
21712171

21722172
* `target_arch = "..."`. Target CPU architecture, such as `"x86"`, `"x86_64"`
2173-
`"mips"`, `"powerpc"`, `"arm"`, or `"aarch64"`.
2173+
`"mips"`, `"arm"`, or `"aarch64"`.
21742174
* `target_endian = "..."`. Endianness of the target CPU, either `"little"` or
21752175
`"big"`.
21762176
* `target_family = "..."`. Operating system family of the target, e. g.

‎branches/auto/src/liballoc/heap.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ unsafe fn exchange_free(ptr: *mut u8, old_size: uint, align: uint) {
119119
not(feature = "external_crate"),
120120
any(target_arch = "arm",
121121
target_arch = "mips",
122-
target_arch = "mipsel",
123-
target_arch = "powerpc")))]
122+
target_arch = "mipsel")))]
124123
const MIN_ALIGN: uint = 8;
125124
#[cfg(all(not(feature = "external_funcs"),
126125
not(feature = "external_crate"),

‎branches/auto/src/libcoretest/mem.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@ fn size_of_basic() {
1919
}
2020

2121
#[test]
22-
#[cfg(target_pointer_width = "32")]
22+
#[cfg(any(target_arch = "x86",
23+
target_arch = "arm",
24+
target_arch = "mips",
25+
target_arch = "mipsel"))]
2326
fn size_of_32() {
2427
assert_eq!(size_of::<uint>(), 4u);
2528
assert_eq!(size_of::<*const uint>(), 4u);
2629
}
2730

2831
#[test]
29-
#[cfg(target_pointer_width = "64")]
32+
#[cfg(any(target_arch = "x86_64",
33+
target_arch = "aarch64"))]
3034
fn size_of_64() {
3135
assert_eq!(size_of::<uint>(), 8u);
3236
assert_eq!(size_of::<*const uint>(), 8u);
@@ -48,14 +52,18 @@ fn align_of_basic() {
4852
}
4953

5054
#[test]
51-
#[cfg(target_pointer_width = "32")]
55+
#[cfg(any(target_arch = "x86",
56+
target_arch = "arm",
57+
target_arch = "mips",
58+
target_arch = "mipsel"))]
5259
fn align_of_32() {
5360
assert_eq!(align_of::<uint>(), 4u);
5461
assert_eq!(align_of::<*const uint>(), 4u);
5562
}
5663

5764
#[test]
58-
#[cfg(target_pointer_width = "64")]
65+
#[cfg(any(target_arch = "x86_64",
66+
target_arch = "aarch64"))]
5967
fn align_of_64() {
6068
assert_eq!(align_of::<uint>(), 8u);
6169
assert_eq!(align_of::<*const uint>(), 8u);

‎branches/auto/src/liblibc/lib.rs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,7 @@ pub mod types {
497497
#[cfg(any(target_arch = "x86",
498498
target_arch = "arm",
499499
target_arch = "mips",
500-
target_arch = "mipsel",
501-
target_arch = "powerpc"))]
500+
target_arch = "mipsel"))]
502501
pub mod arch {
503502
pub mod c95 {
504503
pub type c_char = i8;
@@ -529,8 +528,7 @@ pub mod types {
529528
}
530529
#[cfg(any(target_arch = "x86",
531530
target_arch = "mips",
532-
target_arch = "mipsel",
533-
target_arch = "powerpc"))]
531+
target_arch = "mipsel"))]
534532
pub mod posix88 {
535533
pub type off_t = i32;
536534
pub type dev_t = u64;
@@ -644,9 +642,7 @@ pub mod types {
644642
pub __size: [u32; 9]
645643
}
646644
}
647-
#[cfg(any(target_arch = "mips",
648-
target_arch = "mipsel",
649-
target_arch = "powerpc"))]
645+
#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]
650646
pub mod posix01 {
651647
use types::os::arch::c95::{c_long, c_ulong, time_t};
652648
use types::os::arch::posix88::{gid_t, ino_t};
@@ -2701,9 +2697,7 @@ pub mod consts {
27012697
pub const EHWPOISON: c_int = 133;
27022698
}
27032699

2704-
#[cfg(any(target_arch = "mips",
2705-
target_arch = "mipsel",
2706-
target_arch = "powerpc"))]
2700+
#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]
27072701
pub mod posix88 {
27082702
use types::os::arch::c95::c_int;
27092703
use types::common::c95::c_void;
@@ -2988,8 +2982,7 @@ pub mod consts {
29882982
#[cfg(all(target_os = "linux",
29892983
any(target_arch = "mips",
29902984
target_arch = "mipsel",
2991-
target_arch = "aarch64",
2992-
target_arch = "powerpc")))]
2985+
target_arch = "aarch64")))]
29932986
pub const PTHREAD_STACK_MIN: size_t = 131072;
29942987

29952988
pub const CLOCK_REALTIME: c_int = 0;
@@ -3047,9 +3040,7 @@ pub mod consts {
30473040
pub const SHUT_WR: c_int = 1;
30483041
pub const SHUT_RDWR: c_int = 2;
30493042
}
3050-
#[cfg(any(target_arch = "mips",
3051-
target_arch = "mipsel",
3052-
target_arch = "powerpc"))]
3043+
#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]
30533044
pub mod bsd44 {
30543045
use types::os::arch::c95::c_int;
30553046

@@ -3124,9 +3115,7 @@ pub mod consts {
31243115
pub const MAP_NONBLOCK : c_int = 0x010000;
31253116
pub const MAP_STACK : c_int = 0x020000;
31263117
}
3127-
#[cfg(any(target_arch = "mips",
3128-
target_arch = "mipsel",
3129-
target_arch = "powerpc"))]
3118+
#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]
31303119
pub mod extra {
31313120
use types::os::arch::c95::c_int;
31323121

‎branches/auto/src/librustc/lint/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ impl LintPass for Stability {
17311731
let mut span = e.span;
17321732

17331733
let id = match e.node {
1734-
ast::ExprPath(..) | ast::ExprQPath(..) | ast::ExprStruct(..) => {
1734+
ast::ExprPath(..) | ast::ExprStruct(..) => {
17351735
match cx.tcx.def_map.borrow().get(&e.id) {
17361736
Some(&def) => def.def_id(),
17371737
None => return

‎branches/auto/src/librustc/middle/cfg/construct.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
495495
ast::ExprMac(..) |
496496
ast::ExprClosure(..) |
497497
ast::ExprLit(..) |
498-
ast::ExprPath(..) |
499-
ast::ExprQPath(..) => {
498+
ast::ExprPath(..) => {
500499
self.straightline(expr, pred, None::<ast::Expr>.iter())
501500
}
502501
}

‎branches/auto/src/librustc/middle/check_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn check_expr(v: &mut CheckCrateVisitor, e: &ast::Expr) {
111111
expression");
112112
}
113113
}
114-
ast::ExprPath(_) | ast::ExprQPath(_) => {
114+
ast::ExprPath(_) => {
115115
match v.tcx.def_map.borrow()[e.id] {
116116
DefStatic(..) | DefConst(..) |
117117
DefFn(..) | DefStaticMethod(..) | DefMethod(..) |

‎branches/auto/src/librustc/middle/check_static.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckStaticVisitor<'a, 'tcx> {
228228
"{} are not allowed to have custom pointers",
229229
self.msg());
230230
}
231-
ast::ExprPath(_) | ast::ExprQPath(_) => {
231+
ast::ExprPath(..) => {
232232
match ty::resolve_expr(self.tcx, e) {
233233
def::DefStatic(..) if self.mode == InConstant => {
234234
let msg = "constants cannot refer to other statics, \

‎branches/auto/src/librustc/middle/check_static_recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl<'a, 'ast, 'v> Visitor<'v> for CheckItemRecursionVisitor<'a, 'ast> {
9393

9494
fn visit_expr(&mut self, e: &ast::Expr) {
9595
match e.node {
96-
ast::ExprPath(_) | ast::ExprQPath(_) => {
96+
ast::ExprPath(..) => {
9797
match self.def_map.borrow().get(&e.id) {
9898
Some(&DefStatic(def_id, _)) |
9999
Some(&DefConst(def_id)) if

‎branches/auto/src/librustc/middle/const_eval.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl<'a, 'tcx> ConstEvalVisitor<'a, 'tcx> {
244244

245245
// FIXME: (#3728) we can probably do something CCI-ish
246246
// surrounding nonlocal constants. But we don't yet.
247-
ast::ExprPath(_) | ast::ExprQPath(_) => self.lookup_constness(e),
247+
ast::ExprPath(_) => self.lookup_constness(e),
248248

249249
ast::ExprRepeat(..) => general_const,
250250

@@ -356,13 +356,6 @@ pub fn const_expr_to_pat(tcx: &ty::ctxt, expr: &Expr) -> P<ast::Pat> {
356356
}
357357
}
358358

359-
ast::ExprQPath(_) => {
360-
match lookup_const(tcx, expr) {
361-
Some(actual) => return const_expr_to_pat(tcx, actual),
362-
_ => unreachable!()
363-
}
364-
}
365-
366359
_ => ast::PatLit(P(expr.clone()))
367360
};
368361
P(ast::Pat { id: expr.id, node: pat, span: expr.span })
@@ -549,7 +542,7 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result<const_val, St
549542
ty::ty_float(ast::TyF64) => (f64, const_float, f64)
550543
}))
551544
}
552-
ast::ExprPath(_) | ast::ExprQPath(_) => {
545+
ast::ExprPath(_) => {
553546
match lookup_const(tcx, e) {
554547
Some(actual_e) => eval_const_expr_partial(tcx, &*actual_e),
555548
None => Err("non-constant path in constant expr".to_string())

‎branches/auto/src/librustc/middle/effect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
175175
ast::ExprInlineAsm(..) => {
176176
self.require_unsafe(expr.span, "use of inline assembly");
177177
}
178-
ast::ExprPath(_) | ast::ExprQPath(_) => {
178+
ast::ExprPath(..) => {
179179
if let def::DefStatic(_, true) = ty::resolve_expr(self.tcx, expr) {
180180
self.require_unsafe(expr.span, "use of mutable static");
181181
}

‎branches/auto/src/librustc/middle/expr_use_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
424424
self.walk_expr(&**subexpr)
425425
}
426426

427-
ast::ExprPath(_) | ast::ExprQPath(_) => { }
427+
ast::ExprPath(..) => { }
428428

429429
ast::ExprUnary(ast::UnDeref, ref base) => { // *base
430430
if !self.walk_overloaded_operator(expr, &**base, Vec::new(), PassArgs::ByRef) {

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ fn visit_arm(ir: &mut IrMaps, arm: &ast::Arm) {
447447
fn visit_expr(ir: &mut IrMaps, expr: &Expr) {
448448
match expr.node {
449449
// live nodes required for uses or definitions of variables:
450-
ast::ExprPath(_) | ast::ExprQPath(_) => {
450+
ast::ExprPath(_) => {
451451
let def = ir.tcx.def_map.borrow()[expr.id].clone();
452452
debug!("expr {}: path that leads to {:?}", expr.id, def);
453453
if let DefLocal(..) = def {
@@ -960,7 +960,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
960960
match expr.node {
961961
// Interesting cases with control flow or which gen/kill
962962

963-
ast::ExprPath(_) | ast::ExprQPath(_) => {
963+
ast::ExprPath(_) => {
964964
self.access_path(expr, succ, ACC_READ | ACC_USE)
965965
}
966966

@@ -1289,7 +1289,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
12891289
// just ignore such cases and treat them as reads.
12901290

12911291
match expr.node {
1292-
ast::ExprPath(_) | ast::ExprQPath(_) => succ,
1292+
ast::ExprPath(_) => succ,
12931293
ast::ExprField(ref e, _) => self.propagate_through_expr(&**e, succ),
12941294
ast::ExprTupField(ref e, _) => self.propagate_through_expr(&**e, succ),
12951295
_ => self.propagate_through_expr(expr, succ)
@@ -1300,9 +1300,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
13001300
fn write_lvalue(&mut self, expr: &Expr, succ: LiveNode, acc: uint)
13011301
-> LiveNode {
13021302
match expr.node {
1303-
ast::ExprPath(_) | ast::ExprQPath(_) => {
1304-
self.access_path(expr, succ, acc)
1305-
}
1303+
ast::ExprPath(_) => self.access_path(expr, succ, acc),
13061304

13071305
// We do not track other lvalues, so just propagate through
13081306
// to their subcomponents. Also, it may happen that
@@ -1494,7 +1492,7 @@ fn check_expr(this: &mut Liveness, expr: &Expr) {
14941492
ast::ExprBlock(..) | ast::ExprMac(..) | ast::ExprAddrOf(..) |
14951493
ast::ExprStruct(..) | ast::ExprRepeat(..) | ast::ExprParen(..) |
14961494
ast::ExprClosure(..) | ast::ExprPath(..) | ast::ExprBox(..) |
1497-
ast::ExprRange(..) | ast::ExprQPath(..) => {
1495+
ast::ExprRange(..) => {
14981496
visit::walk_expr(this, expr);
14991497
}
15001498
ast::ExprIfLet(..) => {
@@ -1585,7 +1583,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
15851583

15861584
fn check_lvalue(&mut self, expr: &Expr) {
15871585
match expr.node {
1588-
ast::ExprPath(_) | ast::ExprQPath(_) => {
1586+
ast::ExprPath(_) => {
15891587
if let DefLocal(nid) = self.ir.tcx.def_map.borrow()[expr.id].clone() {
15901588
// Assignment to an immutable variable or argument: only legal
15911589
// if there is no later assignment. If this local is actually

‎branches/auto/src/librustc/middle/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> {
520520
}
521521
}
522522

523-
ast::ExprPath(_) | ast::ExprQPath(_) => {
523+
ast::ExprPath(_) => {
524524
let def = (*self.tcx().def_map.borrow())[expr.id];
525525
self.cat_def(expr.id, expr.span, expr_ty, def)
526526
}

‎branches/auto/src/librustc/middle/privacy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for PrivacyVisitor<'a, 'tcx> {
920920
struct type?!"),
921921
}
922922
}
923-
ast::ExprPath(_) | ast::ExprQPath(_) => {
923+
ast::ExprPath(..) => {
924924
let guard = |&: did: ast::DefId| {
925925
let fields = ty::lookup_struct_fields(self.tcx, did);
926926
let any_priv = fields.iter().any(|f| {

0 commit comments

Comments
 (0)