Skip to content

Commit a10ece0

Browse files
sfacklersfackler
committed
---
yaml --- r: 89594 b: refs/heads/master c: ea9432e h: refs/heads/master v: v3
1 parent c833ee4 commit a10ece0

File tree

11 files changed

+69
-27
lines changed

11 files changed

+69
-27
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 95b18335dac84a86da5e9233710e5ccacc14ed7f
2+
refs/heads/master: ea9432ef00ab306cdadc81fdd523b111cdae0d92
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

‎trunk/Makefile.in

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,12 @@ endef
249249
# by $(2) with a space character prefix, which invalidates the
250250
# construction $(1)$(2).
251251
define CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT
252-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "warning: there are previous" \'$(2)\' "libraries:" $$MATCHES; fi
252+
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: there are previous" \'$(2)\' "libraries:" $$MATCHES; fi
253253
endef
254254

255255
# Same interface as above, but deletes rather than just listing the files.
256256
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
257-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm $$MATCHES ; fi
257+
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "Warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm $$MATCHES ; fi
258258
endef
259259

260260
# We use a different strategy for LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
@@ -265,7 +265,7 @@ endef
265265
# be run at the outset of a command list in a rule.)
266266
ifdef VERBOSE
267267
define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
268-
@echo "info: now are following matches for" '$(2)' "libraries:"
268+
@echo "Info: now are following matches for" '$(2)' "libraries:"
269269
@( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) || true )
270270
endef
271271
else
@@ -677,6 +677,12 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),)
677677
endif
678678

679679
ifneq ($(findstring install,$(MAKECMDGOALS)),)
680+
ifdef DESTDIR
681+
CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)/$(CFG_PREFIX))
682+
CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX)
683+
export CFG_PREFIX
684+
endif
685+
680686
CFG_INFO := $(info cfg: including install rules)
681687
include $(CFG_SRC_DIR)mk/install.mk
682688
endif

‎trunk/configure

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,14 +463,12 @@ then
463463
# extract the first 2 version fields, ignore everything else
464464
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
465465

466-
MIN_PV_MAJOR="1"
467-
MIN_PV_MINOR="9"
468466
# these patterns are shell globs, *not* regexps
469467
PV_MAJOR=${PV_MAJOR_MINOR% *}
470468
PV_MINOR=${PV_MAJOR_MINOR#* }
471-
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
469+
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
472470
then
473-
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
471+
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
474472
BAD_PANDOC=1
475473
fi
476474
fi

‎trunk/mk/install.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
# $(2) is the destination directory
1919
# $(3) is the filename/libname-glob
2020
ifdef VERBOSE
21-
INSTALL = install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3)
21+
INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
2222
else
23-
INSTALL = $(Q)$(call E, install: $(DESTDIR)$(2)/$(3)) && install -m755 $(1)/$(3) $(DESTDIR)$(2)/$(3)
23+
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
2424
endif
2525

2626
# For MK_INSTALL_DIR
2727
# $(1) is the directory to create
28-
MK_INSTALL_DIR = (umask 022 && mkdir -p $(DESTDIR)$(1))
28+
MK_INSTALL_DIR = (umask 022 && mkdir -p $(1))
2929

3030
# For INSTALL_LIB,
3131
# Target-specific $(LIB_SOURCE_DIR) is the source directory
3232
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
3333
# $(1) is the filename/libname-glob
3434
ifdef VERBOSE
35-
DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/
35+
DO_INSTALL_LIB = install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/
3636
else
37-
DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(DESTDIR)$(LIB_DESTIN_DIR)/$(1)) && \
38-
install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(DESTDIR)$(LIB_DESTIN_DIR)/
37+
DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(LIB_DESTIN_DIR)/$(1)) && \
38+
install -m644 `ls -drt1 $(LIB_SOURCE_DIR)/$(1) | tail -1` $(LIB_DESTIN_DIR)/
3939
endif
4040

4141
# Target-specific $(LIB_SOURCE_DIR) is the source directory
@@ -50,7 +50,7 @@ define INSTALL_LIB
5050
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(LIB_SOURCE_DIR)/$(1)))),\
5151
$(wildcard $(LIB_DESTIN_DIR)/$(1)))"; \
5252
if [ -n "$$MATCHES" ]; then \
53-
echo "warning: one or libraries matching Rust library '$(1)'" && \
53+
echo "Warning, one or libraries matching Rust library '$(1)'" && \
5454
echo " (other than '$$LIB_NAME' itself) already present" && \
5555
echo " at destination $(LIB_DESTIN_DIR):" && \
5656
echo $$MATCHES ; \
@@ -152,9 +152,9 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
152152
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
153153
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD)))
154154
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
155-
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustc.1)
156-
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustdoc.1)
157-
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustpkg.1)
155+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustc.1)
156+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustdoc.1)
157+
$(Q)$(call INSTALL,$(S)/man, $(CFG_MANDIR)/man1,rustpkg.1)
158158

159159
install-targets: $(INSTALL_TARGET_RULES)
160160

‎trunk/src/libextra/extra.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ pub mod extra {
118118
pub use std::clone;
119119
pub use std::condition;
120120
pub use std::cmp;
121+
// NOTE: Remove import after next snapshot
122+
#[cfg(stage0)]
123+
pub use std::sys;
121124
pub use std::unstable;
122125
pub use std::str;
123126
pub use std::os;

‎trunk/src/librustdoc/html/render.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,11 @@ impl DocFolder for Cache {
622622
}
623623
None
624624
}
625+
// Private modules may survive the strip-private pass if
626+
// they contain impls for public types, but those will get
627+
// stripped here
628+
clean::Item { inner: clean::ModuleItem(ref m), _ }
629+
if m.items.len() == 0 => None,
625630
i => Some(i),
626631
}
627632
}

‎trunk/src/libstd/char.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ pub fn is_digit_radix(c: char, radix: uint) -> bool {
187187
#[inline]
188188
pub fn to_digit(c: char, radix: uint) -> Option<uint> {
189189
if radix > 36 {
190-
fail!("to_digit: radix {} is too high (maximum 36)", radix);
190+
fail!("to_digit: radix {} is to high (maximum 36)", radix);
191191
}
192192
let val = match c {
193193
'0' .. '9' => c as uint - ('0' as uint),

‎trunk/src/libstd/std.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ pub mod os;
181181
pub mod path;
182182
pub mod rand;
183183
pub mod run;
184+
// NOTE: Remove module after next snapshot
185+
#[cfg(stage0)]
186+
pub mod sys;
184187
pub mod cast;
185188
pub mod fmt;
186189
pub mod repr;
@@ -226,6 +229,9 @@ mod std {
226229
pub use os;
227230
pub use rt;
228231
pub use str;
232+
// NOTE: Remove import after next snapshot
233+
#[cfg(stage0)]
234+
pub use sys;
229235
pub use to_bytes;
230236
pub use to_str;
231237
pub use unstable;

‎trunk/src/libstd/sys.rs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2012 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+
//! Misc low level stuff
12+
13+
// NOTE: Remove this module after an snapshot
14+
15+
#[allow(missing_doc)];
16+
17+
use any::Any;
18+
use kinds::Send;
19+
use rt::task;
20+
21+
pub trait FailWithCause {
22+
fn fail_with(cause: Self, file: &'static str, line: uint) -> !;
23+
}
24+
25+
impl<T: Any + Send> FailWithCause for T {
26+
fn fail_with(msg: T, file: &'static str, line: uint) -> ! {
27+
task::begin_unwind(msg, file, line)
28+
}
29+
}

‎trunk/src/libstd/unstable/intrinsics.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ pub struct TyDesc {
7575
#[cfg(not(test))]
7676
pub enum Opaque { }
7777

78+
#[cfg(stage0)]
79+
pub type Disr = int;
80+
#[cfg(not(stage0))]
7881
pub type Disr = u64;
7982

8083
#[lang="ty_visitor"]

‎trunk/src/snapshots.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
S 2013-11-01 8ea2123
2-
freebsd-x86_64 bc7dea1ca297cfb4bd6d8a32185c6a4fddca3e6b
3-
linux-i386 4b33599d160d757f6021ff05d0213fba3097dde2
4-
linux-x86_64 e7bfa823fedbee5071b8f50b9ffe0cefef844d7c
5-
macos-i386 60a03fed4662abc02b2e836fb0b72b834c9f99d4
6-
macos-x86_64 bfe8351d3dc4e60cc9ab033202e75dcaa10ed12d
7-
winnt-i386 047a1e1a2b7cb0f91c0a634d816d0d44f9f15aa6
8-
91
S 2013-10-29 fed48cc
102
freebsd-x86_64 4a43216b432511a5fd6b727753aedb749f6a68dc
113
linux-i386 53f65d4b1377c17fc12d05d7c4a0fbd92eea071f

0 commit comments

Comments
 (0)