Skip to content

Commit 3aca594

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 81023 b: refs/heads/snap-stage3 c: 83499d1 h: refs/heads/master i: 81021: 26c0431 81019: 897af7a 81015: b663a97 81007: a68382d 80991: 26746e2 80959: 69335a3 80895: 383da1e v: v3
1 parent 9b352ee commit 3aca594

File tree

8 files changed

+21
-36
lines changed

8 files changed

+21
-36
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8c45423a8a2d5edad60583525b02fe2f2911122b
4+
refs/heads/snap-stage3: 83499d1a89ef4e38a0cd0fc02316539a836e24a2
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/mk/tools.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
2121

2222
# Rustdoc, the documentation tool
2323
RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs
24-
RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
24+
RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/, \
25+
*.rs */*.rs */*/*.rs))
2526

2627
# Rusti, the JIT REPL
2728
RUSTI_LIB := $(S)src/librusti/rusti.rs

‎branches/snap-stage3/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
3434
syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
3535

3636
" Reserved (but not yet used) keywords {{{2
37-
syn keyword rustKeyword alignof be offsetof pure sizeof typeof yield
37+
syn keyword rustKeyword be yield typeof
3838

3939
" Built-in types {{{2
4040
syn keyword rustType int uint float char bool u8 u16 u32 u64 f32

‎branches/snap-stage3/src/librustdoc/html/layout.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
3636
3737
<link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400'
3838
rel='stylesheet' type='text/css'>
39-
<link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}main.css\">
39+
<link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{crate}/main.css\">
4040
4141
{favicon, select, none{} other{
4242
<link rel=\"icon\" href=\"#\" sizes=\"16x16\"
@@ -52,7 +52,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
5252
5353
<section class=\"sidebar\">
5454
{logo, select, none{} other{
55-
<a href='{root_path}index.html'><img src='#' alt=''/></a>
55+
<a href='{root_path}{crate}/index.html'><img src='#' alt=''/></a>
5656
}}
5757
5858
{sidebar}
@@ -73,9 +73,9 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
7373
<script>
7474
var rootPath = \"{root_path}\";
7575
</script>
76-
<script src=\"{root_path}jquery.js\"></script>
76+
<script src=\"{root_path}{crate}/jquery.js\"></script>
7777
<script src=\"{root_path}{crate}/search-index.js\"></script>
78-
<script src=\"{root_path}main.js\"></script>
78+
<script src=\"{root_path}{crate}/main.js\"></script>
7979
8080
<div id=\"help\" class=\"hidden\">
8181
<div class=\"shortcuts\">

‎branches/snap-stage3/src/librustdoc/html/render.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,15 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
128128
crate = cache.fold_crate(crate);
129129

130130
// Add all the static files
131-
write(cx.dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
132-
write(cx.dst.push("main.js"), include_str!("static/main.js"));
133-
write(cx.dst.push("main.css"), include_str!("static/main.css"));
134-
write(cx.dst.push("normalize.css"), include_str!("static/normalize.css"));
135-
write(cx.dst.push("index.html"), format!("
136-
<DOCTYPE html><html><head>
137-
<meta http-equiv='refresh'
138-
content=\"0; url={}/index.html\">
139-
</head><body></body></html>
140-
", crate.name));
131+
let dst = cx.dst.push(crate.name);
132+
mkdir(&dst);
133+
write(dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
134+
write(dst.push("main.js"), include_str!("static/main.js"));
135+
write(dst.push("main.css"), include_str!("static/main.css"));
136+
write(dst.push("normalize.css"), include_str!("static/normalize.css"));
141137

142138
{
143-
mkdir(&cx.dst.push(crate.name));
144-
let dst = cx.dst.push(crate.name).push("search-index.js");
139+
let dst = dst.push("search-index.js");
145140
let mut w = BufferedWriter::new(dst.open_writer(io::CreateOrTruncate));
146141
let w = &mut w as &mut io::Writer;
147142
write!(w, "var searchIndex = [");

‎branches/snap-stage3/src/libstd/rt/sched.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,10 +1212,9 @@ mod test {
12121212
}
12131213
}
12141214

1215-
// FIXME: #9407: xfail-test
1215+
#[test]
12161216
fn dont_starve_1() {
12171217
use rt::comm::oneshot;
1218-
use unstable::running_on_valgrind;
12191218

12201219
do stress_factor().times {
12211220
do run_in_mt_newsched_task {

‎branches/snap-stage3/src/libsyntax/parse/token.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,6 @@ fn mk_fresh_ident_interner() -> @ident_interner {
482482
"pure", // 65
483483
"yield", // 66
484484
"typeof", // 67
485-
"alignof", // 68
486-
"offsetof", // 69
487-
"sizeof", // 70
488485
];
489486

490487
@interner::StrInterner::prefill(init_vec)
@@ -625,17 +622,14 @@ pub mod keywords {
625622
True,
626623
Trait,
627624
Type,
625+
Typeof,
628626
Unsafe,
629627
Use,
630628
While,
631629

632630
// Reserved keywords
633-
Alignof,
634631
Be,
635-
Offsetof,
636632
Pure,
637-
Sizeof,
638-
Typeof,
639633
Yield,
640634
}
641635

@@ -673,16 +667,12 @@ pub mod keywords {
673667
True => Ident { name: 57, ctxt: 0 },
674668
Trait => Ident { name: 58, ctxt: 0 },
675669
Type => Ident { name: 59, ctxt: 0 },
670+
Typeof => Ident { name: 67, ctxt: 0 },
676671
Unsafe => Ident { name: 60, ctxt: 0 },
677672
Use => Ident { name: 61, ctxt: 0 },
678673
While => Ident { name: 62, ctxt: 0 },
679-
680-
Alignof => Ident { name: 68, ctxt: 0 },
681674
Be => Ident { name: 64, ctxt: 0 },
682-
Offsetof => Ident { name: 69, ctxt: 0 },
683675
Pure => Ident { name: 65, ctxt: 0 },
684-
Sizeof => Ident { name: 70, ctxt: 0 },
685-
Typeof => Ident { name: 67, ctxt: 0 },
686676
Yield => Ident { name: 66, ctxt: 0 },
687677
}
688678
}
@@ -699,7 +689,7 @@ pub fn is_keyword(kw: keywords::Keyword, tok: &Token) -> bool {
699689
pub fn is_any_keyword(tok: &Token) -> bool {
700690
match *tok {
701691
token::IDENT(sid, false) => match sid.name {
702-
8 | 27 | 32 .. 70 => true,
692+
8 | 27 | 32 .. 67 => true,
703693
_ => false,
704694
},
705695
_ => false
@@ -719,7 +709,7 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
719709
pub fn is_reserved_keyword(tok: &Token) -> bool {
720710
match *tok {
721711
token::IDENT(sid, false) => match sid.name {
722-
64 .. 70 => true,
712+
64 .. 67 => true,
723713
_ => false,
724714
},
725715
_ => false,

‎branches/snap-stage3/src/rustllvm/llvm-auto-clean-trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2013-09-22
4+
2013-09-11

0 commit comments

Comments
 (0)