Skip to content

Commit 6880aa7

Browse files
huonwhuonw
committed
---
yaml --- r: 146052 b: refs/heads/try2 c: 759b20d h: refs/heads/master v: v3
1 parent a81ec74 commit 6880aa7

Some content is hidden

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

63 files changed

+1574
-543
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: 310f7a5f5260034c8186020409facaa54d430b88
8+
refs/heads/try2: 759b20da87b65d45b552adc75dd418e89b201261
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/mk/platform.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,7 @@ define CFG_MAKE_TOOLCHAIN
507507

508508
# For the ARM and MIPS crosses, use the toolchain assembler
509509
# XXX: We should be able to use the LLVM assembler
510-
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
511-
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
510+
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
512511

513512
endif
514513

‎branches/try2/mk/rt.mk

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ RUNTIME_CXXS_$(1)_$(2) := \
9191
rt/miniz.cpp \
9292
rt/memory_region.cpp \
9393
rt/boxed_region.cpp \
94+
rt/arch/$$(HOST_$(1))/context.cpp \
95+
rt/arch/$$(HOST_$(1))/gpr.cpp \
9496
rt/rust_android_dummy.cpp \
9597
rt/rust_test_helpers.cpp
9698

@@ -104,6 +106,7 @@ RUNTIME_CS_$(1)_$(2) := rt/sundown/src/autolink.c \
104106
rt/sundown/html/html.c
105107

106108
RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
109+
rt/arch/$$(HOST_$(1))/ccall.S \
107110
rt/arch/$$(HOST_$(1))/record_sp.S
108111

109112
RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
@@ -119,7 +122,7 @@ RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1
119122
$$(RUNTIME_S_$(1)_$(2):rt/%.S=$$(RT_BUILD_DIR_$(1)_$(2))/%.o)
120123
ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1)_$(2))
121124

122-
MORESTACK_OBJS_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/morestack.o
125+
MORESTACK_OBJ_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/morestack.o
123126
ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1)_$(2))
124127

125128
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.cpp $$(MKFILE_DEPS)
@@ -137,9 +140,9 @@ $$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.S $$(MKFILE_DEPS) \
137140
@$$(call E, compile: $$@)
138141
$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
139142

140-
$$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJS_$(1)_$(2))
143+
$$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
141144
@$$(call E, link: $$@)
142-
$$(Q)$(AR_$(1)) rcs $$@ $$^
145+
$$(Q)$(AR_$(1)) rcs $$@ $$<
143146

144147
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
145148
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1))

‎branches/try2/src/driver/driver.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ extern mod this(name = "rustpkg");
1414
#[cfg(rustdoc)]
1515
extern mod this(name = "rustdoc");
1616

17+
#[cfg(rusti)]
18+
extern mod this(name = "rusti");
19+
20+
#[cfg(rust)]
21+
extern mod this(name = "rust");
22+
1723
#[cfg(rustc)]
1824
extern mod this(name = "rustc");
1925

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2226,7 +2226,6 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
22262226
[path_name(item.ident)]),
22272227
decl,
22282228
body,
2229-
item.attrs,
22302229
llfndecl,
22312230
item.id);
22322231
} else if !generics.is_type_parameterized() {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,15 +386,14 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
386386
path: &ast_map::path,
387387
decl: &ast::fn_decl,
388388
body: &ast::Block,
389-
attrs: &[ast::Attribute],
390389
llwrapfn: ValueRef,
391390
id: ast::NodeId) {
392391
let _icx = push_ctxt("foreign::build_foreign_fn");
393392
let tys = foreign_types_for_id(ccx, id);
394393

395394
unsafe { // unsafe because we call LLVM operations
396395
// Build up the Rust function (`foo0` above).
397-
let llrustfn = build_rust_fn(ccx, path, decl, body, attrs, id);
396+
let llrustfn = build_rust_fn(ccx, path, decl, body, id);
398397

399398
// Build up the foreign wrapper (`foo` above).
400399
return build_wrap_fn(ccx, llrustfn, llwrapfn, &tys);
@@ -404,7 +403,6 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
404403
path: &ast_map::path,
405404
decl: &ast::fn_decl,
406405
body: &ast::Block,
407-
attrs: &[ast::Attribute],
408406
id: ast::NodeId)
409407
-> ValueRef {
410408
let _icx = push_ctxt("foreign::foreign::build_rust_fn");
@@ -436,7 +434,6 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
436434
t.repr(tcx));
437435

438436
let llfndecl = base::decl_internal_rust_fn(ccx, f.sig.inputs, f.sig.output, ps);
439-
base::set_llvm_fn_attrs(attrs, llfndecl);
440437
base::trans_fn(ccx,
441438
(*path).clone(),
442439
decl,

‎branches/try2/src/librustc/rustc.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,8 @@ pub fn monitor(f: ~fn(@diagnostic::Emitter)) {
326326
use std::comm::*;
327327

328328
// XXX: This is a hack for newsched since it doesn't support split stacks.
329-
// rustc needs a lot of stack! When optimizations are disabled, it needs
330-
// even *more* stack than usual as well.
331-
#[cfg(rtopt)]
332-
static STACK_SIZE: uint = 6000000; // 6MB
333-
#[cfg(not(rtopt))]
334-
static STACK_SIZE: uint = 20000000; // 20MB
329+
// rustc needs a lot of stack!
330+
static STACK_SIZE: uint = 6000000;
335331

336332
let (p, ch) = stream();
337333
let ch = SharedChan::new(ch);

‎branches/try2/src/librustdoc/clean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl Clean<Item> for ast::method {
337337
name: Some(self.ident.clean()),
338338
attrs: self.attrs.clean(),
339339
source: self.span.clean(),
340-
id: self.id.clone(),
340+
id: self.self_id.clone(),
341341
visibility: self.vis.clean(),
342342
inner: MethodItem(Method {
343343
generics: self.generics.clean(),

‎branches/try2/src/librustdoc/html/render.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,26 +1344,6 @@ fn item_enum(w: &mut io::Writer, it: &clean::Item, e: &clean::Enum) {
13441344
write!(w, "<tr><td id='variant.{name}'><code>{name}</code></td><td>",
13451345
name = variant.name.get_ref().as_slice());
13461346
document(w, variant);
1347-
match variant.inner {
1348-
clean::VariantItem(ref var) => {
1349-
match var.kind {
1350-
clean::StructVariant(ref s) => {
1351-
write!(w, "<h3 class='fields'>Fields</h3>\n<table>");
1352-
for field in s.fields.iter() {
1353-
write!(w, "<tr><td id='variant.{v}.field.{f}'>\
1354-
<code>{f}</code></td><td>",
1355-
v = variant.name.get_ref().as_slice(),
1356-
f = field.name.get_ref().as_slice());
1357-
document(w, field);
1358-
write!(w, "</td></tr>");
1359-
}
1360-
write!(w, "</table>");
1361-
}
1362-
_ => ()
1363-
}
1364-
}
1365-
_ => ()
1366-
}
13671347
write!(w, "</td></tr>");
13681348
}
13691349
write!(w, "</table>");

‎branches/try2/src/librustdoc/passes.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,8 @@ impl<'self> fold::DocFolder for Stripper<'self> {
135135
}
136136
}
137137

138-
clean::ViewItemItem(*) => {
138+
clean::ViewItemItem(*) | clean::StructFieldItem(*) => {
139139
if i.visibility != Some(ast::public) {
140-
return None
141-
}
142-
}
143-
144-
clean::StructFieldItem(*) => {
145-
if i.visibility == Some(ast::private) {
146140
return None;
147141
}
148142
}

‎branches/try2/src/libstd/fmt/mod.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,20 +134,20 @@ actually requesting that an argument ascribes to a particular trait. This allows
134134
multiple actual types to be formatted via `{:d}` (like `i8` as well as `int`).
135135
The current mapping of types to traits is:
136136
137-
* `?` => Poly
138-
* `d` => Signed
139-
* `i` => Signed
140-
* `u` => Unsigned
141-
* `b` => Bool
142-
* `c` => Char
143-
* `o` => Octal
144-
* `x` => LowerHex
145-
* `X` => UpperHex
146-
* `s` => String
147-
* `p` => Pointer
148-
* `t` => Binary
149-
* `f` => Float
150-
* `` (nothing) => Default
137+
* `?` ⇒ `Poly`
138+
* `d` ⇒ `Signed`
139+
* `i` ⇒ `Signed`
140+
* `u` ⇒ `Unsigned`
141+
* `b` ⇒ `Bool`
142+
* `c` ⇒ `Char`
143+
* `o` ⇒ `Octal`
144+
* `x` ⇒ `LowerHex`
145+
* `X` ⇒ `UpperHex`
146+
* `s` ⇒ `String`
147+
* `p` ⇒ `Pointer`
148+
* `t` ⇒ `Binary`
149+
* `f` ⇒ `Float`
150+
* *nothing* ⇒ `Default`
151151
152152
What this means is that any type of argument which implements the
153153
`std::fmt::Binary` trait can then be formatted with `{:t}`. Implementations are

0 commit comments

Comments
 (0)