Skip to content

Commit a0d2ed4

Browse files
committed
---
yaml --- r: 179400 b: refs/heads/tmp c: 19d8d3e h: refs/heads/master v: v3
1 parent 98386e4 commit a0d2ed4

File tree

6 files changed

+24
-19
lines changed

6 files changed

+24
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 0ba9e1fa52627404a1e5b90f745f96a872a0c564
37+
refs/heads/tmp: 19d8d3e53f7449c1b82765d4968477bc6e9f8687

branches/tmp/configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,9 @@ probe CFG_GRUN grun
653653
probe CFG_FLEX flex
654654
probe CFG_BISON bison
655655
probe CFG_PANDOC pandoc
656+
probe CFG_PDFLATEX pdflatex
656657
probe CFG_XELATEX xelatex
658+
probe CFG_LUALATEX lualatex
657659
probe CFG_GDB gdb
658660
probe CFG_LLDB lldb
659661

branches/tmp/mk/docs.mk

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,27 @@ else
8585
HTML_DEPS :=
8686
endif
8787

88-
# Check for xelatex
89-
90-
ifeq ($(CFG_XELATEX),)
88+
# Check for the various external utilities for the EPUB/PDF docs:
89+
90+
ifeq ($(CFG_LUALATEX),)
91+
$(info cfg: no lualatex found, deferring to xelatex)
92+
ifeq ($(CFG_XELATEX),)
93+
$(info cfg: no xelatex found, deferring to pdflatex)
94+
ifeq ($(CFG_PDFLATEX),)
95+
$(info cfg: no pdflatex found, disabling LaTeX docs)
96+
NO_PDF_DOCS = 1
97+
else
98+
CFG_LATEX := $(CFG_PDFLATEX)
99+
endif
100+
else
91101
CFG_LATEX := $(CFG_XELATEX)
92102
XELATEX = 1
93-
else
94-
$(info cfg: no xelatex found, disabling LaTeX docs)
95-
NO_PDF_DOCS = 1
103+
endif
104+
else
105+
CFG_LATEX := $(CFG_LUALATEX)
96106
endif
97107

108+
98109
ifeq ($(CFG_PANDOC),)
99110
$(info cfg: no pandoc found, omitting PDF and EPUB docs)
100111
ONLY_HTML_DOCS = 1

branches/tmp/src/libcollections/vec.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,7 @@ impl<T> Vec<T> {
690690
/// Panics if the number of elements in the vector overflows a `usize`.
691691
///
692692
/// # Examples
693-
///
694-
/// ```
693+
/// ```rust
695694
/// let mut vec = vec![1, 2, 3];
696695
/// let mut vec2 = vec![4, 5, 6];
697696
/// vec.append(&mut vec2);
@@ -1003,13 +1002,8 @@ impl<T> Vec<T> {
10031002
///
10041003
/// Note that the capacity of `self` does not change.
10051004
///
1006-
/// # Panics
1007-
///
1008-
/// Panics if `at > len`.
1009-
///
10101005
/// # Examples
1011-
///
1012-
/// ```
1006+
/// ```rust
10131007
/// let mut vec = vec![1,2,3];
10141008
/// let vec2 = vec.split_off(1);
10151009
/// assert_eq!(vec, vec![1]);
@@ -1019,7 +1013,7 @@ impl<T> Vec<T> {
10191013
#[unstable(feature = "collections",
10201014
reason = "new API, waiting for dust to settle")]
10211015
pub fn split_off(&mut self, at: usize) -> Self {
1022-
assert!(at <= self.len(), "`at` out of bounds");
1016+
assert!(at < self.len(), "`at` out of bounds");
10231017

10241018
let other_len = self.len - at;
10251019
let mut other = Vec::with_capacity(other_len);

branches/tmp/src/libstd/sys/unix/c.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ pub const WNOHANG: libc::c_int = 1;
7272
#[cfg(target_os = "linux")]
7373
pub const _SC_GETPW_R_SIZE_MAX: libc::c_int = 70;
7474
#[cfg(any(target_os = "macos",
75-
target_os = "freebsd",
76-
target_os = "dragonfly"))]
75+
target_os = "freebsd"))]
7776
pub const _SC_GETPW_R_SIZE_MAX: libc::c_int = 71;
7877
#[cfg(target_os = "openbsd")]
7978
pub const _SC_GETPW_R_SIZE_MAX: libc::c_int = 101;
@@ -95,7 +94,6 @@ pub struct passwd {
9594
#[repr(C)]
9695
#[cfg(any(target_os = "macos",
9796
target_os = "freebsd",
98-
target_os = "dragonfly",
9997
target_os = "openbsd"))]
10098
pub struct passwd {
10199
pub pw_name: *mut libc::c_char,

0 commit comments

Comments
 (0)