Skip to content

Commit 1bca766

Browse files
committed
---
yaml --- r: 179401 b: refs/heads/tmp c: 19983b9bde78fbdbf61c24c17fd558335cfd9afd h: refs/heads/master i: 179399: 98386e4 v: v3
1 parent a0d2ed4 commit 1bca766

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
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: 19d8d3e53f7449c1b82765d4968477bc6e9f8687
37+
refs/heads/tmp: 19983b9bde78fbdbf61c24c17fd558335cfd9afd

branches/tmp/configure

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

branches/tmp/mk/docs.mk

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

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
88+
# Check for xelatex
89+
90+
ifeq ($(CFG_XELATEX),)
10191
CFG_LATEX := $(CFG_XELATEX)
10292
XELATEX = 1
103-
endif
104-
else
105-
CFG_LATEX := $(CFG_LUALATEX)
93+
else
94+
$(info cfg: no xelatex found, disabling LaTeX docs)
95+
NO_PDF_DOCS = 1
10696
endif
10797

108-
10998
ifeq ($(CFG_PANDOC),)
11099
$(info cfg: no pandoc found, omitting PDF and EPUB docs)
111100
ONLY_HTML_DOCS = 1

branches/tmp/src/libcollections/vec.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,8 @@ impl<T> Vec<T> {
690690
/// Panics if the number of elements in the vector overflows a `usize`.
691691
///
692692
/// # Examples
693-
/// ```rust
693+
///
694+
/// ```
694695
/// let mut vec = vec![1, 2, 3];
695696
/// let mut vec2 = vec![4, 5, 6];
696697
/// vec.append(&mut vec2);
@@ -1002,8 +1003,13 @@ impl<T> Vec<T> {
10021003
///
10031004
/// Note that the capacity of `self` does not change.
10041005
///
1006+
/// # Panics
1007+
///
1008+
/// Panics if `at > len`.
1009+
///
10051010
/// # Examples
1006-
/// ```rust
1011+
///
1012+
/// ```
10071013
/// let mut vec = vec![1,2,3];
10081014
/// let vec2 = vec.split_off(1);
10091015
/// assert_eq!(vec, vec![1]);
@@ -1013,7 +1019,7 @@ impl<T> Vec<T> {
10131019
#[unstable(feature = "collections",
10141020
reason = "new API, waiting for dust to settle")]
10151021
pub fn split_off(&mut self, at: usize) -> Self {
1016-
assert!(at < self.len(), "`at` out of bounds");
1022+
assert!(at <= self.len(), "`at` out of bounds");
10171023

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ 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"))]
75+
target_os = "freebsd",
76+
target_os = "dragonfly"))]
7677
pub const _SC_GETPW_R_SIZE_MAX: libc::c_int = 71;
7778
#[cfg(target_os = "openbsd")]
7879
pub const _SC_GETPW_R_SIZE_MAX: libc::c_int = 101;
@@ -94,6 +95,7 @@ pub struct passwd {
9495
#[repr(C)]
9596
#[cfg(any(target_os = "macos",
9697
target_os = "freebsd",
98+
target_os = "dragonfly",
9799
target_os = "openbsd"))]
98100
pub struct passwd {
99101
pub pw_name: *mut libc::c_char,

0 commit comments

Comments
 (0)