Skip to content

Rolling up PRs in the queue #15864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Jul 21, 2014
Merged

Rolling up PRs in the queue #15864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fca79e4
Guide: improve error handling
steveklabnik Jul 15, 2014
e8c9d21
Guessing game explanation
steveklabnik Jul 15, 2014
1607064
repair macro docs
jbclements Jul 17, 2014
a491551
rustc: Print a smaller hash on -v
alexcrichton Jul 18, 2014
fcaee85
rlibc: fix bug in `memcmp()`
Jul 20, 2014
d32fe7e
rlibc: add unit tests
Jul 20, 2014
9631bf2
rustc: Make `monitor` public.
brson Jul 19, 2014
1c3655b
rustc: Extract --crate-type parsing to its own function
brson Jul 20, 2014
c88bf10
rustc: Pass optional additional plugins to compile_input
brson Jul 20, 2014
ec0f1cb
rustc: Allow the crate linked to as 'std' to be customized
brson Jul 20, 2014
97ca98f
Address review feedback
brson Jul 20, 2014
ec70f2b
rustdoc: Add an --extern flag analagous to rustc's
tomjakubowski Jul 20, 2014
c86873b
Document Deque.
treeman Jul 20, 2014
9aaaa6b
Move in-place functions below their iterator variants.
treeman Jul 20, 2014
2e40078
Place union as the first function, for consistency.
treeman Jul 20, 2014
f4d9dca
Group union, intersect and difference in Bitv.
treeman Jul 20, 2014
681aa58
Document Bitv.
treeman Jul 20, 2014
b05f605
Document BitvSet.
treeman Jul 20, 2014
26047f1
Move intersection above difference and symmetric_differance.
treeman Jul 20, 2014
4574b2f
Main bitv example: prime sieve.
treeman Jul 20, 2014
71afdc4
Enclose None as `None`.
treeman Jul 20, 2014
e68333a
Polish bitv docs.
treeman Jul 20, 2014
2957644
Describe BitPositions and TwoBitPositions.
treeman Jul 20, 2014
2357c44
Simplify and cleanup bitv examples.
treeman Jul 20, 2014
0e1880d
syntax: Join consecutive string literals in format strings together
Jul 20, 2014
e3887a7
Update LLVM to include NullCheckElimination pass
dotdash Jul 20, 2014
2e24ef3
Rename to_str to to_string
sfackler Jul 21, 2014
456884b
Remove useless RefCells
sfackler Jul 21, 2014
d27918a
Restructure test harness
sfackler Jul 21, 2014
6531d02
Purge !resolve_unexported
sfackler Jul 21, 2014
2daa097
Don't create reexport module if there are none
sfackler Jul 21, 2014
6807349
privacy: Add publically-reexported foreign item to exported item set
ktt3ja Jul 21, 2014
dfacef5
fix string in from_utf8_lossy_100_multibyte benchmark
tedhorst Jul 21, 2014
36e1f2d
Get rid of few warnings in tests
Sawyer47 Jul 20, 2014
37bb6ed
Clarify the std::vec::Vec docs regarding capacity
ftxqxd Jul 21, 2014
414862d
Test fixes from the rollup
alexcrichton Jul 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mk/docs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
$(wildcard $(D)/*.*) | doc/
@$(call E, version-info: $@)
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
$(CFG_VER_HASH) | head -c 8)/;\
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(\
CFG_SHORT_VER_HASH)/;\
s/STAMP/$(CFG_VER_HASH)/;" $< >$@

GENERATED += doc/version.tex doc/version_info.html
Expand Down
3 changes: 2 additions & 1 deletion mk/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)
CFG_VERSION += ($(CFG_VER_HASH) $(CFG_VER_DATE))
CFG_SHORT_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse --short=9 HEAD)
CFG_VERSION += ($(CFG_SHORT_VER_HASH) $(CFG_VER_DATE))
endif
endif

Expand Down
Loading