Skip to content

Commit 19c57ef

Browse files
brsonbrson
committed
---
yaml --- r: 139504 b: refs/heads/try2 c: e3327d3 h: refs/heads/master v: v3
1 parent 3c43485 commit 19c57ef

37 files changed

+52
-131
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: be792589d0925f8f77c3b5f0fc91e1d2f7a5dfb6
8+
refs/heads/try2: e3327d3833e6b1ea4b23ecd3332b869ce82f1999
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,9 +1539,9 @@ for spawning [tasks][tasks].
15391539

15401540
Rust closures have a convenient subtyping property: you can pass any kind of
15411541
closure (as long as the arguments and return types match) to functions
1542-
that expect a `&fn()`. Thus, when writing a higher-order function that
1542+
that expect a `fn()`. Thus, when writing a higher-order function that
15431543
only calls its function argument, and does nothing else with it, you
1544-
should almost always declare the type of that argument as `&fn()`. That way,
1544+
should almost always declare the type of that argument as `fn()`. That way,
15451545
callers may pass any kind of closure.
15461546

15471547
~~~~

‎branches/try2/mk/install.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ $(foreach target,$(CFG_TARGET_TRIPLES), \
5151
define INSTALL_TARGET_N
5252
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
5353
$$(Q)mkdir -p $$(PTL$(1)$(2))
54-
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
54+
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
5555
$$(Q)$$(call INSTALL_LIB, \
5656
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
5757
$$(Q)$$(call INSTALL_LIB, \
5858
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
59-
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
59+
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
6060

6161
endef
6262

6363
define INSTALL_HOST_N
6464
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
6565
$$(Q)mkdir -p $$(PTL$(1)$(2))
66-
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
66+
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
6767
$$(Q)$$(call INSTALL_LIB, \
6868
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
6969
$$(Q)$$(call INSTALL_LIB, \
@@ -80,7 +80,7 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
8080
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB_$(1)))
8181
$$(Q)$$(call INSTALL_LIB, \
8282
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB_$(1)))
83-
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
83+
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
8484

8585
endef
8686

‎branches/try2/mk/platform.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ ifdef CFG_VALGRIND
6161
endif
6262

6363
ifneq ($(findstring linux,$(CFG_OSTYPE)),)
64+
# -znoexecstack is here because librt is for some reason being created
65+
# with executable stack and Fedora (or SELinux) doesn't like that (#798)
6466
ifdef CFG_PERF
6567
ifneq ($(CFG_PERF_WITH_LOGFD),)
6668
CFG_PERF_TOOL := $(CFG_PERF) stat -r 3 --log-fd 2
@@ -124,7 +126,7 @@ CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
124126
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m64
125127
CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
126128
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-whole-archive
127-
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive
129+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
128130
CFG_DEF_SUFFIX_x86_64-unknown-linux-gnu := .linux.def
129131
CFG_INSTALL_NAME_x86_64-unknown-linux-gnu =
130132
CFG_LIBUV_LINK_FLAGS_x86_64-unknown-linux-gnu =
@@ -150,7 +152,7 @@ CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
150152
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m32
151153
CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
152154
CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
153-
CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive
155+
CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
154156
CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
155157
CFG_INSTALL_NAME_i686-unknown-linux-gnu =
156158
CFG_LIBUV_LINK_FLAGS_i686-unknown-linux-gnu =
@@ -226,7 +228,7 @@ CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
226228
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ -lgnustl_shared
227229
CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
228230
CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
229-
CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
231+
CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive -Wl,-znoexecstack
230232
CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
231233
CFG_INSTALL_NAME_arm-linux-androideabi =
232234
CFG_LIBUV_LINK_FLAGS_arm-linux-androideabi =

‎branches/try2/src/librustc/metadata/creader.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use metadata::decoder;
1818
use metadata::filesearch::FileSearch;
1919
use metadata::loader;
2020

21-
use core::either;
2221
use core::hashmap::linear::LinearMap;
2322
use core::vec;
2423
use syntax::attr;

‎branches/try2/src/librustc/middle/lint.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use util::ppaux::{ty_to_str};
1818
use core::hashmap::linear::LinearMap;
1919
use core::char;
2020
use core::cmp;
21-
use core::either;
2221
use core::i8;
2322
use core::i16;
2423
use core::i32;

‎branches/try2/src/librustc/middle/moves.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ pub impl VisitContext {
718718
}
719719

720720
fn use_receiver(&self,
721-
expr_id: node_id,
722-
span: span,
721+
_expr_id: node_id,
722+
_span: span,
723723
receiver_expr: @expr,
724724
visitor: vt<VisitContext>)
725725
{

‎branches/try2/src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ pub impl Resolver {
13581358
item_id: def_id,
13591359
+parent_privacy: Privacy,
13601360
parent: ReducedGraphParent,
1361-
&&visitor: vt<ReducedGraphParent>) {
1361+
&&_visitor: vt<ReducedGraphParent>) {
13621362
let ident = variant.node.name;
13631363
let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
13641364
variant.span);

‎branches/try2/src/librustc/middle/trans/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use core::prelude::*;
1212

1313
use back::abi;
14-
use lib::llvm::{llvm, SetLinkage, InternalLinkage, PrivateLinkage,
14+
use lib::llvm::{llvm, SetLinkage, PrivateLinkage,
1515
ValueRef, TypeRef, Bool, True, False};
1616
use metadata::csearch;
1717
use middle::const_eval;

‎branches/try2/src/librustc/middle/trans/foreign.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use core::prelude::*;
1212

1313
use back::{link, abi};
14-
use driver::session;
1514
use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg};
1615
use lib::llvm::{TypeRef, ValueRef};
1716
use lib;

‎branches/try2/src/librustc/middle/typeck/check/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ use util::common::{block_query, indenter, loop_query};
110110
use util::ppaux::{bound_region_to_str, expr_repr, pat_repr};
111111
use util::ppaux;
112112

113-
use core::either;
114113
use core::hashmap::linear::LinearMap;
115114
use core::ptr;
116115
use core::result::{Result, Ok, Err};
@@ -119,7 +118,7 @@ use core::str;
119118
use core::vec;
120119
use std::list::Nil;
121120
use syntax::abi::AbiSet;
122-
use syntax::ast::{provided, required, ty_i};
121+
use syntax::ast::{provided, required};
123122
use syntax::ast;
124123
use syntax::ast_map;
125124
use syntax::ast_util::local_def;
@@ -3021,7 +3020,7 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
30213020
vs: &[ast::variant],
30223021
id: ast::node_id) {
30233022
fn do_check(ccx: @mut CrateCtxt,
3024-
sp: span,
3023+
_sp: span,
30253024
vs: &[ast::variant],
30263025
id: ast::node_id,
30273026
disr_vals: &mut ~[int],
@@ -3303,7 +3302,7 @@ pub fn type_is_c_like_enum(fcx: @mut FnCtxt, sp: span, typ: ty::t) -> bool {
33033302

33043303
pub fn ast_expr_vstore_to_vstore(fcx: @mut FnCtxt,
33053304
e: @ast::expr,
3306-
n: uint,
3305+
_n: uint,
33073306
v: ast::expr_vstore)
33083307
-> ty::vstore {
33093308
match v {

‎branches/try2/src/librustc/middle/typeck/collect.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ are represented as `ty_param()` instances.
3333
use core::prelude::*;
3434

3535
use metadata::csearch;
36-
use middle::ty::{InstantiatedTraitRef, arg};
36+
use middle::ty::InstantiatedTraitRef;
3737
use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty};
3838
use middle::ty;
3939
use middle::typeck::astconv::{AstConv, ty_of_arg};
@@ -860,7 +860,7 @@ pub fn ty_of_item(ccx: &CrateCtxt, it: @ast::item)
860860
tcx.tcache.insert(local_def(it.id), tpt);
861861
return tpt;
862862
}
863-
ast::item_fn(ref decl, purity, abi, ref generics, _) => {
863+
ast::item_fn(ref decl, purity, _, ref generics, _) => {
864864
let bounds = ty_param_bounds(ccx, generics);
865865
let tofd = astconv::ty_of_bare_fn(ccx,
866866
&empty_rscope,

‎branches/try2/src/librustc/middle/typeck/infer/coercion.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,19 @@ we may want to adjust precisely when coercions occur.
6666

6767
use core::prelude::*;
6868

69-
use middle::ty::{TyVar, AutoPtr, AutoBorrowVec, AutoBorrowFn};
70-
use middle::ty::{AutoAdjustment, AutoDerefRef, AutoRef};
71-
use middle::ty::{vstore_slice, vstore_box, vstore_uniq, vstore_fixed};
69+
use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowFn};
70+
use middle::ty::{AutoDerefRef, AutoRef};
71+
use middle::ty::{vstore_slice, vstore_box, vstore_uniq};
7272
use middle::ty::{mt};
7373
use middle::ty;
7474
use middle::typeck::infer::{CoerceResult, resolve_type};
7575
use middle::typeck::infer::combine::CombineFields;
7676
use middle::typeck::infer::sub::Sub;
7777
use middle::typeck::infer::to_str::InferStr;
7878
use middle::typeck::infer::resolve::try_resolve_tvar_shallow;
79-
use util::common::{indent, indenter};
79+
use util::common::indenter;
8080

81-
use syntax::abi::AbiSet;
82-
use syntax::ast::{m_const, m_imm, m_mutbl};
81+
use syntax::ast::m_imm;
8382
use syntax::ast;
8483

8584
// Note: Coerce is not actually a combiner, in that it does not

‎branches/try2/src/librustc/middle/typeck/infer/glb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use middle::typeck::infer::{cres, InferCtxt};
2121
use middle::typeck::isr_alist;
2222
use syntax::ast;
2323
use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
24-
use syntax::ast::{noreturn, pure_fn, ret_style, return_val, unsafe_fn};
24+
use syntax::ast::{pure_fn, unsafe_fn};
2525
use syntax::ast::{Onceness, purity};
2626
use syntax::abi::AbiSet;
2727
use syntax::codemap::span;

‎branches/try2/src/libstd/net_tcp.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use uv;
2020
use uv::iotask;
2121
use uv::iotask::IoTask;
2222

23-
use core::io::{Reader, ReaderUtil, Writer};
2423
use core::io;
2524
use core::libc::size_t;
2625
use core::libc;
@@ -1439,7 +1438,7 @@ struct TcpBufferedSocketData {
14391438
mut buf_off: uint
14401439
}
14411440

1442-
//#[cfg(test)]
1441+
#[cfg(test)]
14431442
pub mod test {
14441443
use net::ip;
14451444
use net::tcp::{GenericListenErr, TcpConnectErrData, TcpListenErrData};

‎branches/try2/src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// The Rust abstract syntax tree.
1212

13-
use codemap::{span, FileName, spanned};
13+
use codemap::{span, spanned};
1414
use abi::AbiSet;
1515
use opt_vec::OptVec;
1616

‎branches/try2/src/libsyntax/ast_map.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use ast::*;
1515
use ast;
1616
use ast_util::{inlined_item_utils, stmt_id};
1717
use ast_util;
18-
use attr;
1918
use codemap;
2019
use codemap::spanned;
2120
use diagnostic::span_handler;

‎branches/try2/src/libsyntax/attr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use codemap::BytePos;
1919
use diagnostic::span_handler;
2020
use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
2121

22-
use core::either::Either;
2322
use core::vec;
2423
use core::hashmap::linear::LinearSet;
2524
use std;

‎branches/try2/src/libsyntax/ext/deriving/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ pub fn create_enum_variant_pattern(cx: @ext_ctxt,
286286
}
287287
}
288288

289-
pub fn variant_arg_count(cx: @ext_ctxt, span: span, variant: &variant) -> uint {
289+
pub fn variant_arg_count(_cx: @ext_ctxt, _span: span, variant: &variant) -> uint {
290290
match variant.node.kind {
291291
tuple_variant_kind(ref args) => args.len(),
292292
struct_variant_kind(ref struct_def) => struct_def.fields.len(),

‎branches/try2/src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use core::prelude::*;
1717

1818
use abi::AbiSet;
19-
use ast::{ident, node_id};
19+
use ast::ident;
2020
use ast;
2121
use ast_util;
2222
use codemap::{span, respan, dummy_sp, spanned};

‎branches/try2/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3777,7 +3777,7 @@ pub impl Parser {
37773777
};
37783778
}
37793779

3780-
fn parse_enum_def(&self, generics: &ast::Generics) -> enum_def {
3780+
fn parse_enum_def(&self, _generics: &ast::Generics) -> enum_def {
37813781
let mut variants = ~[];
37823782
let mut all_nullary = true, have_disr = false;
37833783
while *self.token != token::RBRACE {

‎branches/try2/src/libsyntax/print/pprust.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use core::prelude::*;
1212

1313
use abi::AbiSet;
14-
use abi;
1514
use ast::{RegionTyParamBound, TraitTyParamBound, required, provided};
1615
use ast;
1716
use ast_util;
@@ -2180,7 +2179,7 @@ pub fn print_opt_sigil(s: @ps, opt_sigil: Option<ast::Sigil>) {
21802179
}
21812180

21822181
pub fn print_fn_header_info(s: @ps,
2183-
opt_sty: Option<ast::self_ty_>,
2182+
_opt_sty: Option<ast::self_ty_>,
21842183
opt_purity: Option<ast::purity>,
21852184
abis: AbiSet,
21862185
onceness: ast::Onceness,

‎branches/try2/src/rt/arch/arm/_context.S

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// Mark stack as non-executable
2-
#if defined(__linux__) && defined(__ELF__)
3-
.section .note.GNU-stack, "", @progbits
4-
#endif
5-
61
.text
72
.code 32
83
.arm
@@ -22,12 +17,12 @@ swap_registers:
2217
str r10, [r0, #40]
2318
str r11, [r0, #44]
2419
str r12, [r0, #48]
25-
str sp, [r0, #52]
20+
str sp, [r0, #52]
2621
str lr, [r0, #56]
2722

2823
mrs r2, cpsr
2924
str r2, [r0, #64]
30-
25+
3126

3227
ldr r0, [r1, #0]
3328
ldr r3, [r1, #12]
@@ -40,10 +35,10 @@ swap_registers:
4035
ldr r10, [r1, #40]
4136
ldr r11, [r1, #44]
4237
ldr r12, [r1, #48]
43-
38+
4439
ldr sp, [r1, #52]
4540
ldr lr, [r1, #56]
46-
41+
4742
ldr r2, [r1, #64]
4843
msr cpsr_cxsf, r2
4944

‎branches/try2/src/rt/arch/arm/ccall.S

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// Mark stack as non-executable
2-
#if defined(__linux__) && defined(__ELF__)
3-
.section .note.GNU-stack, "", @progbits
4-
#endif
5-
61
.text
72
.code 32
83
.arm
@@ -24,3 +19,4 @@ __morestack:
2419
pop {r4, fp, lr}
2520
mov pc, lr
2621
.fnend
22+

‎branches/try2/src/rt/arch/arm/morestack.S

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
// Mark stack as non-executable
2-
#if defined(__linux__) && defined(__ELF__)
3-
.section .note.GNU-stack, "", @progbits
4-
#endif
5-
61
.text
72
.code 32
83
.arm

0 commit comments

Comments
 (0)