Skip to content

Commit 089df48

Browse files
author
Ariel Ben-Yehuda
committed
---
yaml --- r: 235949 b: refs/heads/stable c: 757b0c1 h: refs/heads/master i: 235947: e26ee49 v: v3
1 parent b816a63 commit 089df48

File tree

119 files changed

+7458
-1910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+7458
-1910
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: d576ef3d7be3efe28f902bbb3b2197f4553db412
32+
refs/heads/stable: 757b0c176fa185fda59283efaf0d8079b702ca69
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66
*.rs rust
77
src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
9+
src/rt/msvc/* -whitespace
10+
src/rt/valgrind/* -whitespace
911
*.woff binary

‎branches/stable/configure

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,7 @@ valopt llvm-root "" "set LLVM root"
601601
valopt python "" "set path to python"
602602
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
603603
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
604-
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path (deprecated)"
605-
valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
606-
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
604+
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
607605
valopt release-channel "dev" "the name of the release channel to build"
608606
valopt musl-root "/usr/local" "MUSL root installation directory"
609607

@@ -1114,24 +1112,20 @@ do
11141112
fi
11151113

11161114
case $i in
1117-
*android*)
1118-
upper_snake_target=$(echo "$i" | tr '[:lower:]' '[:upper:]' | tr '\-' '\_')
1119-
eval ndk=\$"CFG_${upper_snake_target}_NDK"
1120-
if [ -z "$ndk" ]
1115+
arm-linux-androideabi)
1116+
1117+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc ]
11211118
then
1122-
ndk=$CFG_ANDROID_CROSS_PATH
1123-
eval "CFG_${upper_snake_target}_NDK"=$CFG_ANDROID_CROSS_PATH
1124-
warn "generic/default Android NDK option is deprecated (use --$i-ndk option instead)"
1119+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc not found"
1120+
fi
1121+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-g++ ]
1122+
then
1123+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-g++ not found"
1124+
fi
1125+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-ar ]
1126+
then
1127+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-ar not found"
11251128
fi
1126-
1127-
# Perform a basic sanity check of the NDK
1128-
for android_ndk_tool in "$ndk/bin/$i-gcc" "$ndk/bin/$i-g++" "$ndk/bin/$i-ar"
1129-
do
1130-
if [ ! -f $android_ndk_tool ]
1131-
then
1132-
err "NDK tool $android_ndk_tool not found (bad or missing --$i-ndk option?)"
1133-
fi
1134-
done
11351129
;;
11361130

11371131
arm-apple-darwin)
@@ -1688,8 +1682,7 @@ putvar CFG_HOST
16881682
putvar CFG_TARGET
16891683
putvar CFG_LIBDIR_RELATIVE
16901684
putvar CFG_DISABLE_MANAGE_SUBMODULES
1691-
putvar CFG_AARCH64_LINUX_ANDROID_NDK
1692-
putvar CFG_ARM_LINUX_ANDROIDEABI_NDK
1685+
putvar CFG_ANDROID_CROSS_PATH
16931686
putvar CFG_MANDIR
16941687

16951688
# Avoid spurious warnings from clang by feeding it original source on

‎branches/stable/mk/cfg/aarch64-linux-android.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# aarch64-linux-android configuration
22
# CROSS_PREFIX_aarch64-linux-android-
3-
CC_aarch64-linux-android=$(CFG_AARCH64_LINUX_ANDROID_NDK)/bin/aarch64-linux-android-gcc
4-
CXX_aarch64-linux-android=$(CFG_AARCH64_LINUX_ANDROID_NDK)/bin/aarch64-linux-android-g++
5-
CPP_aarch64-linux-android=$(CFG_AARCH64_LINUX_ANDROID_NDK)/bin/aarch64-linux-android-gcc -E
6-
AR_aarch64-linux-android=$(CFG_AARCH64_LINUX_ANDROID_NDK)/bin/aarch64-linux-android-ar
3+
CC_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
4+
CXX_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-g++
5+
CPP_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc -E
6+
AR_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-ar
77
CFG_LIB_NAME_aarch64-linux-android=lib$(1).so
88
CFG_STATIC_LIB_NAME_aarch64-linux-android=lib$(1).a
99
CFG_LIB_GLOB_aarch64-linux-android=lib$(1)-*.so

‎branches/stable/mk/cfg/arm-linux-androideabi.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# arm-linux-androideabi configuration
2-
CC_arm-linux-androideabi=$(CFG_ARM_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-gcc
3-
CXX_arm-linux-androideabi=$(CFG_ARM_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-g++
4-
CPP_arm-linux-androideabi=$(CFG_ARM_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-gcc -E
5-
AR_arm-linux-androideabi=$(CFG_ARM_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-ar
2+
CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
3+
CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
4+
CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
5+
AR_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
66
CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
77
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
88
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so

‎branches/stable/src/doc/trpl/compiler-plugins.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
6161
("I", 1)];
6262
6363
let text = match args {
64-
[TtToken(_, token::Ident(s, _))] => s.to_string(),
64+
[TtToken(_, token::Ident(s, _))] => token::get_ident(s).to_string(),
6565
_ => {
6666
cx.span_err(sp, "argument should be a single identifier");
6767
return DummyResult::any(sp);
@@ -186,7 +186,8 @@ impl LintPass for Pass {
186186
}
187187
188188
fn check_item(&mut self, cx: &Context, it: &ast::Item) {
189-
if it.ident.name == "lintme" {
189+
let name = token::get_ident(it.ident);
190+
if name.get() == "lintme" {
190191
cx.span_lint(TEST_LINT, it.span, "item is named 'lintme'");
191192
}
192193
}

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

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
use core::prelude::*;
5757

5858
use heap;
59-
use raw_vec::RawVec;
6059

6160
use core::any::Any;
6261
use core::cmp::Ordering;
@@ -66,7 +65,7 @@ use core::marker::{self, Unsize};
6665
use core::mem;
6766
use core::ops::{CoerceUnsized, Deref, DerefMut};
6867
use core::ops::{Placer, Boxed, Place, InPlace, BoxPlace};
69-
use core::ptr::{self, Unique};
68+
use core::ptr::Unique;
7069
use core::raw::{TraitObject};
7170

7271
/// A value that represents the heap. This is the default place that the `box`
@@ -515,55 +514,3 @@ impl<'a,A,R> FnOnce<A> for Box<FnBox<A,Output=R>+Send+'a> {
515514
}
516515

517516
impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
518-
519-
#[stable(feature = "box_slice_clone", since = "1.3.0")]
520-
impl<T: Clone> Clone for Box<[T]> {
521-
fn clone(&self) -> Self {
522-
let mut new = BoxBuilder {
523-
data: RawVec::with_capacity(self.len()),
524-
len: 0
525-
};
526-
527-
let mut target = new.data.ptr();
528-
529-
for item in self.iter() {
530-
unsafe {
531-
ptr::write(target, item.clone());
532-
target = target.offset(1);
533-
};
534-
535-
new.len += 1;
536-
}
537-
538-
return unsafe { new.into_box() };
539-
540-
// Helper type for responding to panics correctly.
541-
struct BoxBuilder<T> {
542-
data: RawVec<T>,
543-
len: usize,
544-
}
545-
546-
impl<T> BoxBuilder<T> {
547-
unsafe fn into_box(self) -> Box<[T]> {
548-
let raw = ptr::read(&self.data);
549-
mem::forget(self);
550-
raw.into_box()
551-
}
552-
}
553-
554-
impl<T> Drop for BoxBuilder<T> {
555-
fn drop(&mut self) {
556-
let mut data = self.data.ptr();
557-
let max = unsafe { data.offset(self.len as isize) };
558-
559-
while data != max {
560-
unsafe {
561-
ptr::read(data);
562-
data = data.offset(1);
563-
}
564-
}
565-
}
566-
}
567-
}
568-
}
569-

‎branches/stable/src/liballoc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
#![feature(core)]
7777
#![feature(core_intrinsics)]
7878
#![feature(core_prelude)]
79-
#![feature(core_slice_ext)]
8079
#![feature(custom_attribute)]
8180
#![feature(fundamental)]
8281
#![feature(lang_items)]

‎branches/stable/src/libcollectionstest/slice.rs

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,59 +1270,6 @@ fn test_to_vec() {
12701270
assert_eq!(ys, [1, 2, 3]);
12711271
}
12721272

1273-
#[test]
1274-
fn test_box_slice_clone() {
1275-
let data = vec![vec![0, 1], vec![0], vec![1]];
1276-
let data2 = data.clone().into_boxed_slice().clone().to_vec();
1277-
1278-
assert_eq!(data, data2);
1279-
}
1280-
1281-
#[test]
1282-
fn test_box_slice_clone_panics() {
1283-
use std::sync::Arc;
1284-
use std::sync::atomic::{AtomicUsize, Ordering};
1285-
use std::thread::spawn;
1286-
1287-
struct Canary {
1288-
count: Arc<AtomicUsize>,
1289-
panics: bool
1290-
}
1291-
1292-
impl Drop for Canary {
1293-
fn drop(&mut self) {
1294-
self.count.fetch_add(1, Ordering::SeqCst);
1295-
}
1296-
}
1297-
1298-
impl Clone for Canary {
1299-
fn clone(&self) -> Self {
1300-
if self.panics { panic!() }
1301-
1302-
Canary {
1303-
count: self.count.clone(),
1304-
panics: self.panics
1305-
}
1306-
}
1307-
}
1308-
1309-
let drop_count = Arc::new(AtomicUsize::new(0));
1310-
let canary = Canary { count: drop_count.clone(), panics: false };
1311-
let panic = Canary { count: drop_count.clone(), panics: true };
1312-
1313-
spawn(move || {
1314-
// When xs is dropped, +5.
1315-
let xs = vec![canary.clone(), canary.clone(), canary.clone(),
1316-
panic, canary].into_boxed_slice();
1317-
1318-
// When panic is cloned, +3.
1319-
xs.clone();
1320-
}).join().unwrap_err();
1321-
1322-
// Total = 8
1323-
assert_eq!(drop_count.load(Ordering::SeqCst), 8);
1324-
}
1325-
13261273
mod bench {
13271274
use std::iter::repeat;
13281275
use std::{mem, ptr};

‎branches/stable/src/librustc/ast_map/mod.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ impl PathElem {
4747

4848
impl fmt::Display for PathElem {
4949
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
50-
write!(f, "{}", self.name())
50+
let slot = token::get_name(self.name());
51+
write!(f, "{}", slot)
5152
}
5253
}
5354

@@ -1072,18 +1073,18 @@ fn node_id_to_string(map: &Map, id: NodeId, include_id: bool) -> String {
10721073
match ii.node {
10731074
ConstImplItem(..) => {
10741075
format!("assoc const {} in {}{}",
1075-
ii.ident,
1076+
token::get_ident(ii.ident),
10761077
map.path_to_string(id),
10771078
id_str)
10781079
}
10791080
MethodImplItem(..) => {
10801081
format!("method {} in {}{}",
1081-
ii.ident,
1082+
token::get_ident(ii.ident),
10821083
map.path_to_string(id), id_str)
10831084
}
10841085
TypeImplItem(_) => {
10851086
format!("assoc type {} in {}{}",
1086-
ii.ident,
1087+
token::get_ident(ii.ident),
10871088
map.path_to_string(id),
10881089
id_str)
10891090
}
@@ -1102,13 +1103,13 @@ fn node_id_to_string(map: &Map, id: NodeId, include_id: bool) -> String {
11021103

11031104
format!("{} {} in {}{}",
11041105
kind,
1105-
ti.ident,
1106+
token::get_ident(ti.ident),
11061107
map.path_to_string(id),
11071108
id_str)
11081109
}
11091110
Some(NodeVariant(ref variant)) => {
11101111
format!("variant {} in {}{}",
1111-
variant.node.name,
1112+
token::get_ident(variant.node.name),
11121113
map.path_to_string(id), id_str)
11131114
}
11141115
Some(NodeExpr(ref expr)) => {

‎branches/stable/src/librustc/lint/context.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use lint::builtin;
3434
use util::nodemap::FnvHashMap;
3535

3636
use std::cell::RefCell;
37-
use std::cmp;
3837
use std::mem;
3938
use syntax::ast_util::IdVisitingOperation;
4039
use syntax::attr::AttrMetaMethods;
@@ -67,9 +66,6 @@ pub struct LintStore {
6766
/// Map of registered lint groups to what lints they expand to. The bool
6867
/// is true if the lint group was added by a plugin.
6968
lint_groups: FnvHashMap<&'static str, (Vec<LintId>, bool)>,
70-
71-
/// Maximum level a lint can be
72-
lint_cap: Option<Level>,
7369
}
7470

7571
/// The targed of the `by_name` map, which accounts for renaming/deprecation.
@@ -98,10 +94,7 @@ impl LintStore {
9894
}
9995
}
10096

101-
fn set_level(&mut self, lint: LintId, mut lvlsrc: LevelSource) {
102-
if let Some(cap) = self.lint_cap {
103-
lvlsrc.0 = cmp::min(lvlsrc.0, cap);
104-
}
97+
fn set_level(&mut self, lint: LintId, lvlsrc: LevelSource) {
10598
if lvlsrc.0 == Allow {
10699
self.levels.remove(&lint);
107100
} else {
@@ -116,7 +109,6 @@ impl LintStore {
116109
by_name: FnvHashMap(),
117110
levels: FnvHashMap(),
118111
lint_groups: FnvHashMap(),
119-
lint_cap: None,
120112
}
121113
}
122114

@@ -235,13 +227,6 @@ impl LintStore {
235227
}
236228
}
237229
}
238-
239-
self.lint_cap = sess.opts.lint_cap;
240-
if let Some(cap) = self.lint_cap {
241-
for level in self.levels.iter_mut().map(|p| &mut (p.1).0) {
242-
*level = cmp::min(*level, cap);
243-
}
244-
}
245230
}
246231
}
247232

‎branches/stable/src/librustc/metadata/creader.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ use syntax::attr::AttrMetaMethods;
3333
use syntax::codemap::{self, Span, mk_sp, Pos};
3434
use syntax::parse;
3535
use syntax::parse::token::InternedString;
36+
use syntax::parse::token;
3637
use syntax::visit;
3738
use log;
3839

@@ -180,18 +181,19 @@ impl<'a> CrateReader<'a> {
180181
fn extract_crate_info(&self, i: &ast::Item) -> Option<CrateInfo> {
181182
match i.node {
182183
ast::ItemExternCrate(ref path_opt) => {
184+
let ident = token::get_ident(i.ident);
183185
debug!("resolving extern crate stmt. ident: {} path_opt: {:?}",
184-
i.ident, path_opt);
186+
ident, path_opt);
185187
let name = match *path_opt {
186188
Some(name) => {
187-
validate_crate_name(Some(self.sess), &name.as_str(),
189+
validate_crate_name(Some(self.sess), name.as_str(),
188190
Some(i.span));
189-
name.to_string()
191+
name.as_str().to_string()
190192
}
191-
None => i.ident.to_string(),
193+
None => ident.to_string(),
192194
};
193195
Some(CrateInfo {
194-
ident: i.ident.to_string(),
196+
ident: ident.to_string(),
195197
name: name,
196198
id: i.id,
197199
should_link: should_link(i),

0 commit comments

Comments
 (0)