Skip to content

Commit e7fecaa

Browse files
author
Dave Huseby
committed
---
yaml --- r: 228275 b: refs/heads/try c: 1a928f4 h: refs/heads/master i: 228273: af61495 228271: b62e8a0 v: v3
1 parent 1e3459b commit e7fecaa

File tree

16 files changed

+178
-41
lines changed

16 files changed

+178
-41
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: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 0c052199b92104ba6d64886ff779cf89c3c384d9
4+
refs/heads/try: 1a928f434ae218e0e1d4cf63d53eb6612b5abe80
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/mk/cfg/i686-unknown-freebsd.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# i686-unknown-freebsd configuration
2+
CC_i686-unknown-freebsd=$(CC)
3+
CXX_i686-unknown-freebsd=$(CXX)
4+
CPP_i686-unknown-freebsd=$(CPP)
5+
AR_i686-unknown-freebsd=$(AR)
6+
CFG_LIB_NAME_i686-unknown-freebsd=lib$(1).so
7+
CFG_STATIC_LIB_NAME_i686-unknown-freebsd=lib$(1).a
8+
CFG_LIB_GLOB_i686-unknown-freebsd=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_i686-unknown-freebsd=$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -m32 -arch i386 -I/usr/local/include $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -Wall -Werror -g -fPIC -m32 -arch i386 -I/usr/local/include $(CFLAGS)
12+
CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -m32 -shared -fPIC -g -pthread -lrt
13+
CFG_GCCISH_DEF_FLAG_i686-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
14+
CFG_LLC_FLAGS_i686-unknown-freebsd :=
15+
CFG_INSTALL_NAME_i686-unknown-freebsd =
16+
CFG_EXE_SUFFIX_i686-unknown-freebsd :=
17+
CFG_WINDOWSY_i686-unknown-freebsd :=
18+
CFG_UNIXY_i686-unknown-freebsd := 1
19+
CFG_LDPATH_i686-unknown-freebsd :=
20+
CFG_RUN_i686-unknown-freebsd=$(2)
21+
CFG_RUN_TARG_i686-unknown-freebsd=$(call CFG_RUN_i686-unknown-freebsd,,$(2))
22+
CFG_GNU_TRIPLE_i686-unknown-freebsd := i686-unknown-freebsd

‎branches/try/src/liballoc/boxed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ use core::raw::{TraitObject};
7171
/// The following two examples are equivalent:
7272
///
7373
/// ```
74-
/// #![feature(box_heap)]
74+
/// # #![feature(box_heap)]
7575
/// #![feature(box_syntax)]
7676
/// use std::boxed::HEAP;
7777
///
@@ -162,7 +162,7 @@ impl<T : ?Sized> Box<T> {
162162
///
163163
/// # Examples
164164
/// ```
165-
/// #![feature(box_raw)]
165+
/// # #![feature(box_raw)]
166166
/// use std::boxed;
167167
///
168168
/// let seventeen = Box::new(17u32);

‎branches/try/src/libcollections/vec_deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl<T> VecDeque<T> {
108108
ptr::write(self.ptr.offset(off as isize), t);
109109
}
110110

111-
/// Returns true if and only if the buffer is at capacity
111+
/// Returns true iff the buffer is at capacity
112112
#[inline]
113113
fn is_full(&self) -> bool { self.cap - self.len() == 1 }
114114

‎branches/try/src/libcore/fmt/builders.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
175175
fn is_pretty(&self) -> bool {
176176
self.fmt.flags() & (1 << (FlagV1::Alternate as usize)) != 0
177177
}
178-
179-
/// Returns the wrapped `Formatter`.
180-
#[unstable(feature = "debug_builder_formatter", reason = "recently added")]
181-
pub fn formatter(&mut self) -> &mut fmt::Formatter<'b> {
182-
&mut self.fmt
183-
}
184178
}
185179

186180
struct DebugInner<'a, 'b: 'a> {

‎branches/try/src/libcore/fmt/mod.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,19 +1488,20 @@ macro_rules! tuple {
14881488
impl<$($name:Debug),*> Debug for ($($name,)*) {
14891489
#[allow(non_snake_case, unused_assignments)]
14901490
fn fmt(&self, f: &mut Formatter) -> Result {
1491-
let mut builder = f.debug_tuple("");
1491+
try!(write!(f, "("));
14921492
let ($(ref $name,)*) = *self;
14931493
let mut n = 0;
14941494
$(
1495-
builder.field($name);
1495+
if n > 0 {
1496+
try!(write!(f, ", "));
1497+
}
1498+
try!(write!(f, "{:?}", *$name));
14961499
n += 1;
14971500
)*
1498-
14991501
if n == 1 {
1500-
try!(write!(builder.formatter(), ","));
1502+
try!(write!(f, ","));
15011503
}
1502-
1503-
builder.finish()
1504+
write!(f, ")")
15041505
}
15051506
}
15061507
peel! { $($name,)* }

‎branches/try/src/libcore/num/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ macro_rules! uint_impl {
11261126
acc
11271127
}
11281128

1129-
/// Returns `true` if and only if `self == 2^k` for some `k`.
1129+
/// Returns `true` iff `self == 2^k` for some `k`.
11301130
#[stable(feature = "rust1", since = "1.0.0")]
11311131
#[inline]
11321132
pub fn is_power_of_two(self) -> bool {

‎branches/try/src/liblibc/lib.rs

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,100 @@ pub mod types {
960960
}
961961
}
962962

963+
#[cfg(target_arch = "x86")]
964+
pub mod arch {
965+
pub mod c95 {
966+
pub type c_char = i8;
967+
pub type c_schar = i8;
968+
pub type c_uchar = u8;
969+
pub type c_short = i16;
970+
pub type c_ushort = u16;
971+
pub type c_int = i32;
972+
pub type c_uint = u32;
973+
pub type c_long = i32;
974+
pub type c_ulong = u32;
975+
pub type c_float = f32;
976+
pub type c_double = f64;
977+
pub type size_t = u32;
978+
pub type ptrdiff_t = i32;
979+
pub type clock_t = i32;
980+
pub type time_t = i32;
981+
pub type suseconds_t = i32;
982+
pub type wchar_t = i32;
983+
}
984+
pub mod c99 {
985+
pub type c_longlong = i64;
986+
pub type c_ulonglong = u64;
987+
pub type intptr_t = i32;
988+
pub type uintptr_t = u32;
989+
pub type intmax_t = i64;
990+
pub type uintmax_t = u64;
991+
}
992+
pub mod posix88 {
993+
pub type off_t = i64;
994+
pub type dev_t = u32;
995+
pub type ino_t = u32;
996+
pub type pid_t = i32;
997+
pub type uid_t = u32;
998+
pub type gid_t = u32;
999+
pub type useconds_t = u32;
1000+
pub type mode_t = u16;
1001+
pub type ssize_t = i32;
1002+
}
1003+
pub mod posix01 {
1004+
use types::common::c95::{c_void};
1005+
use types::common::c99::{uint8_t, uint32_t, int32_t};
1006+
use types::os::arch::c95::{c_long, time_t};
1007+
use types::os::arch::posix88::{dev_t, gid_t, ino_t};
1008+
use types::os::arch::posix88::{mode_t, off_t};
1009+
use types::os::arch::posix88::{uid_t};
1010+
1011+
pub type nlink_t = u16;
1012+
pub type blksize_t = i32;
1013+
pub type blkcnt_t = i64;
1014+
pub type fflags_t = u32;
1015+
#[repr(C)]
1016+
#[derive(Copy, Clone)] pub struct stat {
1017+
pub st_dev: dev_t,
1018+
pub st_ino: ino_t,
1019+
pub st_mode: mode_t,
1020+
pub st_nlink: nlink_t,
1021+
pub st_uid: uid_t,
1022+
pub st_gid: gid_t,
1023+
pub st_rdev: dev_t,
1024+
pub st_atime: time_t,
1025+
pub st_atime_nsec: c_long,
1026+
pub st_mtime: time_t,
1027+
pub st_mtime_nsec: c_long,
1028+
pub st_ctime: time_t,
1029+
pub st_ctime_nsec: c_long,
1030+
pub st_size: off_t,
1031+
pub st_blocks: blkcnt_t,
1032+
pub st_blksize: blksize_t,
1033+
pub st_flags: fflags_t,
1034+
pub st_gen: uint32_t,
1035+
pub st_lspare: int32_t,
1036+
pub st_birthtime: time_t,
1037+
pub st_birthtime_nsec: c_long,
1038+
pub __unused: [uint8_t; 2],
1039+
}
1040+
1041+
#[repr(C)]
1042+
#[derive(Copy, Clone)] pub struct utimbuf {
1043+
pub actime: time_t,
1044+
pub modtime: time_t,
1045+
}
1046+
1047+
pub type pthread_attr_t = *mut c_void;
1048+
}
1049+
pub mod posix08 {
1050+
}
1051+
pub mod bsd44 {
1052+
}
1053+
pub mod extra {
1054+
}
1055+
}
1056+
9631057
#[cfg(target_arch = "x86_64")]
9641058
pub mod arch {
9651059
pub mod c95 {

‎branches/try/src/librustc_back/target/i686_unknown_freebsd.rs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2014 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+
use target::Target;
12+
13+
pub fn target() -> Target {
14+
let mut base = super::freebsd_base::opts();
15+
base.cpu = "pentium4".to_string();
16+
base.pre_link_args.push("-m32".to_string());
17+
base.morestack = false;
18+
19+
Target {
20+
data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string(),
21+
llvm_target: "i686-unknown-freebsd".to_string(),
22+
target_endian: "little".to_string(),
23+
target_pointer_width: "32".to_string(),
24+
arch: "x86".to_string(),
25+
target_os: "freebsd".to_string(),
26+
target_env: "".to_string(),
27+
options: base,
28+
}
29+
}

‎branches/try/src/librustc_back/target/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ impl Target {
368368
arm_linux_androideabi,
369369
aarch64_linux_android,
370370

371+
i686_unknown_freebsd,
371372
x86_64_unknown_freebsd,
372373

373374
i686_unknown_dragonfly,

‎branches/try/src/librustdoc/html/layout.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ r##"<!DOCTYPE html>
7272
<div class="search-container">
7373
<input class="search-input" name="search"
7474
autocomplete="off"
75-
placeholder="Click or press ‘S’ to search, ‘?’ for more options…"
75+
placeholder="Click or press 'S' to search, '?' for more options..."
7676
type="search">
7777
</div>
7878
</form>
@@ -85,7 +85,7 @@ r##"<!DOCTYPE html>
8585
8686
<div id="help" class="hidden">
8787
<div class="shortcuts">
88-
<h1>Keyboard Shortcuts</h1>
88+
<h1>Keyboard shortcuts</h1>
8989
<dl>
9090
<dt>?</dt>
9191
<dd>Show this help dialog</dd>
@@ -100,7 +100,7 @@ r##"<!DOCTYPE html>
100100
</dl>
101101
</div>
102102
<div class="infos">
103-
<h1>Search Tricks</h1>
103+
<h1>Search tricks</h1>
104104
<p>
105105
Prefix searches with a type followed by a colon (e.g.
106106
<code>fn:</code>) to restrict the search to a given type.

‎branches/try/src/librustdoc/html/static/main.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
447447

448448
#help {
449449
background: #e9e9e9;
450+
border-radius: 4px;
450451
box-shadow: 0 0 6px rgba(0,0,0,.2);
451452
position: absolute;
452453
top: 300px;
@@ -460,7 +461,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
460461

461462
#help dt {
462463
float: left;
463-
border-radius: 4px;
464+
border-radius: 3px;
464465
border: 1px solid #bfbfbf;
465466
background: #fff;
466467
width: 23px;

‎branches/try/src/librustdoc/html/static/playpen.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ document.addEventListener('DOMContentLoaded', function() {
1616
return;
1717
}
1818

19-
var featureRegexp = new RegExp('^\s*#!\\[feature\\(\.*?\\)\\]');
2019
var elements = document.querySelectorAll('pre.rust');
2120

2221
Array.prototype.forEach.call(elements, function(el) {
@@ -30,14 +29,8 @@ document.addEventListener('DOMContentLoaded', function() {
3029
a.setAttribute('class', 'test-arrow');
3130

3231
var code = el.previousElementSibling.textContent;
33-
34-
var channel = '';
35-
if (featureRegexp.test(code)) {
36-
channel = '&version=nightly';
37-
}
38-
3932
a.setAttribute('href', window.playgroundUrl + '?code=' +
40-
encodeURIComponent(code) + channel);
33+
encodeURIComponent(code));
4134
a.setAttribute('target', '_blank');
4235

4336
el.appendChild(a);

‎branches/try/src/libstd/array.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
//! A fixed-size array is denoted `[T; N]` for the element type `T` and
12-
//! the compile time constant size `N`. The size must be zero or positive.
12+
//! the compile time constant size `N`. The size should be zero or positive.
1313
//!
1414
//! Arrays values are created either with an explicit expression that lists
1515
//! each element: `[x, y, z]` or a repeat expression: `[x; N]`. The repeat
@@ -32,9 +32,7 @@
3232
//!
3333
//! [slice]: primitive.slice.html
3434
//!
35-
//! Rust does not currently support generics over the size of an array type.
36-
//!
37-
//! # Examples
35+
//! ## Examples
3836
//!
3937
//! ```
4038
//! let mut array: [i32; 3] = [0; 3];
@@ -51,5 +49,7 @@
5149
//!
5250
//! ```
5351
//!
52+
//! Rust does not currently support generics over the size of an array type.
53+
//!
5454
5555
#![doc(primitive = "array")]

‎branches/try/src/libstd/sys/common/stack.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ pub unsafe fn record_sp_limit(limit: usize) {
170170
asm!("movl $$0x48+90*4, %eax
171171
movl $0, %gs:(%eax)" :: "r"(limit) : "eax" : "volatile")
172172
}
173-
#[cfg(all(target_arch = "x86",
174-
any(target_os = "linux", target_os = "freebsd")))]
173+
#[cfg(all(target_arch = "x86", target_os = "linux"))]
175174
#[inline(always)]
176175
unsafe fn target_record_sp_limit(limit: usize) {
177176
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
@@ -197,10 +196,12 @@ pub unsafe fn record_sp_limit(limit: usize) {
197196
// aarch64 - FIXME(AARCH64): missing...
198197
// powerpc - FIXME(POWERPC): missing...
199198
// arm-ios - iOS segmented stack is disabled for now, see related notes
200-
// openbsd - segmented stack is disabled
199+
// openbsd/bitrig/netbsd - no segmented stacks.
200+
// x86-freebsd - no segmented stacks.
201201
#[cfg(any(target_arch = "aarch64",
202202
target_arch = "powerpc",
203203
all(target_arch = "arm", target_os = "ios"),
204+
all(target_arch = "x86", target_os = "freebsd"),
204205
target_os = "bitrig",
205206
target_os = "netbsd",
206207
target_os = "openbsd"))]
@@ -262,8 +263,7 @@ pub unsafe fn get_sp_limit() -> usize {
262263
movl %gs:(%eax), $0" : "=r"(limit) :: "eax" : "volatile");
263264
return limit;
264265
}
265-
#[cfg(all(target_arch = "x86",
266-
any(target_os = "linux", target_os = "freebsd")))]
266+
#[cfg(all(target_arch = "x86", target_os = "linux"))]
267267
#[inline(always)]
268268
unsafe fn target_get_sp_limit() -> usize {
269269
let limit;
@@ -291,14 +291,16 @@ pub unsafe fn get_sp_limit() -> usize {
291291

292292
// aarch64 - FIXME(AARCH64): missing...
293293
// powerpc - FIXME(POWERPC): missing...
294-
// arm-ios - iOS doesn't support segmented stacks yet.
295-
// openbsd - OpenBSD doesn't support segmented stacks.
294+
// arm-ios - no segmented stacks.
295+
// openbsd/bitrig/netbsd - no segmented stacks.
296+
// x86-freebsd - no segmented stacks.
296297
//
297298
// This function might be called by runtime though
298299
// so it is unsafe to unreachable, let's return a fixed constant.
299300
#[cfg(any(target_arch = "aarch64",
300301
target_arch = "powerpc",
301302
all(target_arch = "arm", target_os = "ios"),
303+
all(target_arch = "x86", target_os = "freebsd"),
302304
target_os = "bitrig",
303305
target_os = "netbsd",
304306
target_os = "openbsd"))]

‎branches/try/src/rust-installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit c37d3747da75c280237dc2d6b925078e69555499
1+
Subproject commit 0da191a30ba385215c5eb1dc97c2b5f076f93b07

0 commit comments

Comments
 (0)