Skip to content

Commit ad50e16

Browse files
borsbors
committed
---
yaml --- r: 225787 b: refs/heads/stable c: bca2ea6 h: refs/heads/master i: 225785: 57dbd00 225783: c29fc2f v: v3
1 parent 9a7e890 commit ad50e16

File tree

121 files changed

+2087
-1643
lines changed

Some content is hidden

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

121 files changed

+2087
-1643
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: cae1d67406fc4778ffe92d18319414b0f78e8b07
32+
refs/heads/stable: bca2ea6c4a20de7fde36c5493b860933861be3c3
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

‎branches/stable/RELEASES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
Version 1.1.0 (July 2015)
2+
========================
3+
4+
* NNNN changes, numerous bugfixes
5+
6+
Libraries
7+
---------
8+
9+
* The [`std::fs` module has been expanded][fs-expand] to expand the set of
10+
functionality exposed:
11+
* `DirEntry` now supports optimizations like `file_type` and `metadata` which
12+
don't incur a syscall on some platforms.
13+
* A `symlink_metadata` function has been added.
14+
* The `fs::Metadata` structure now lowers to its OS counterpart, providing
15+
access to all underlying information.
16+
17+
[fs-expand]: https://github.com/rust-lang/rust/pull/25844
18+
119
Version 1.0.0 (May 2015)
220
========================
321

‎branches/stable/src/doc/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ extern fn new_i32() -> i32 { 0 }
11111111
extern "stdcall" fn new_i32_stdcall() -> i32 { 0 }
11121112
```
11131113

1114-
Unlike normal functions, extern fns have an `extern "ABI" fn()`. This is the
1114+
Unlike normal functions, extern fns have type `extern "ABI" fn()`. This is the
11151115
same type as the functions declared in an extern block.
11161116

11171117
```

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,6 @@ impl<T: ?Sized> Deref for Arc<T> {
330330
}
331331
}
332332

333-
#[stable(feature = "rc_arc_as_ref", since = "1.2.0")]
334-
impl<T: ?Sized> AsRef<T> for Arc<T> {
335-
336-
#[inline]
337-
fn as_ref(&self) -> &T {
338-
&self.inner().data
339-
}
340-
}
341-
342333
impl<T: Clone> Arc<T> {
343334
/// Make a mutable reference from the given `Arc<T>`.
344335
///

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ use std::boxed;
156156
use core::cell::Cell;
157157
use core::clone::Clone;
158158
use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};
159-
use core::convert::AsRef;
160159
use core::default::Default;
161160
use core::fmt;
162161
use core::hash::{Hasher, Hash};
@@ -380,15 +379,6 @@ impl<T: ?Sized> Deref for Rc<T> {
380379
}
381380
}
382381

383-
#[stable(feature = "rc_arc_as_ref", since = "1.2.0")]
384-
impl<T: ?Sized> AsRef<T> for Rc<T> {
385-
386-
#[inline(always)]
387-
fn as_ref(&self) -> &T {
388-
&self.inner().value
389-
}
390-
}
391-
392382
#[stable(feature = "rust1", since = "1.0.0")]
393383
impl<T: ?Sized> Drop for Rc<T> {
394384
/// Drops the `Rc<T>`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ pub fn get_enum_variants<'tcx>(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::Nod
719719
item, tcx, cdata);
720720
let name = item_name(&*intr, item);
721721
let (ctor_ty, arg_tys, arg_names) = match ctor_ty.sty {
722-
ty::ty_bare_fn(_, ref f) =>
722+
ty::TyBareFn(_, ref f) =>
723723
(Some(ctor_ty), f.sig.0.inputs.clone(), None),
724724
_ => { // Nullary or struct enum variant.
725725
let mut arg_names = Vec::new();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use syntax::abi;
2828
use syntax::ast;
2929
use syntax::parse::token;
3030

31-
// Compact string representation for Ty values. API ty_str &
31+
// Compact string representation for Ty values. API TyStr &
3232
// parse_from_str. Extra parameters are for converting to/from def_ids in the
3333
// data buffer. Whatever format you choose should not contain pipe characters.
3434

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub struct ctxt<'a, 'tcx: 'a> {
4141
pub abbrevs: &'a abbrev_map<'tcx>
4242
}
4343

44-
// Compact string representation for Ty values. API ty_str & parse_from_str.
44+
// Compact string representation for Ty values. API TyStr & parse_from_str.
4545
// Extra parameters are for converting to/from def_ids in the string rep.
4646
// Whatever format you choose should not contain pipe characters.
4747
pub struct ty_abbrev {
@@ -60,9 +60,9 @@ pub fn enc_ty<'a, 'tcx>(w: &mut Encoder, cx: &ctxt<'a, 'tcx>, t: Ty<'tcx>) {
6060
let pos = w.mark_stable_position();
6161

6262
match t.sty {
63-
ty::ty_bool => mywrite!(w, "b"),
64-
ty::ty_char => mywrite!(w, "c"),
65-
ty::ty_int(t) => {
63+
ty::TyBool => mywrite!(w, "b"),
64+
ty::TyChar => mywrite!(w, "c"),
65+
ty::TyInt(t) => {
6666
match t {
6767
ast::TyIs => mywrite!(w, "is"),
6868
ast::TyI8 => mywrite!(w, "MB"),
@@ -71,7 +71,7 @@ pub fn enc_ty<'a, 'tcx>(w: &mut Encoder, cx: &ctxt<'a, 'tcx>, t: Ty<'tcx>) {
7171
ast::TyI64 => mywrite!(w, "MD")
7272
}
7373
}
74-
ty::ty_uint(t) => {
74+
ty::TyUint(t) => {
7575
match t {
7676
ast::TyUs => mywrite!(w, "us"),
7777
ast::TyU8 => mywrite!(w, "Mb"),
@@ -80,37 +80,37 @@ pub fn enc_ty<'a, 'tcx>(w: &mut Encoder, cx: &ctxt<'a, 'tcx>, t: Ty<'tcx>) {
8080
ast::TyU64 => mywrite!(w, "Md")
8181
}
8282
}
83-
ty::ty_float(t) => {
83+
ty::TyFloat(t) => {
8484
match t {
8585
ast::TyF32 => mywrite!(w, "Mf"),
8686
ast::TyF64 => mywrite!(w, "MF"),
8787
}
8888
}
89-
ty::ty_enum(def, substs) => {
89+
ty::TyEnum(def, substs) => {
9090
mywrite!(w, "t[{}|", (cx.ds)(def));
9191
enc_substs(w, cx, substs);
9292
mywrite!(w, "]");
9393
}
94-
ty::ty_trait(box ty::TyTrait { ref principal,
94+
ty::TyTrait(box ty::TraitTy { ref principal,
9595
ref bounds }) => {
9696
mywrite!(w, "x[");
9797
enc_trait_ref(w, cx, principal.0);
9898
enc_existential_bounds(w, cx, bounds);
9999
mywrite!(w, "]");
100100
}
101-
ty::ty_tup(ref ts) => {
101+
ty::TyTuple(ref ts) => {
102102
mywrite!(w, "T[");
103103
for t in ts { enc_ty(w, cx, *t); }
104104
mywrite!(w, "]");
105105
}
106-
ty::ty_uniq(typ) => { mywrite!(w, "~"); enc_ty(w, cx, typ); }
107-
ty::ty_ptr(mt) => { mywrite!(w, "*"); enc_mt(w, cx, mt); }
108-
ty::ty_rptr(r, mt) => {
106+
ty::TyBox(typ) => { mywrite!(w, "~"); enc_ty(w, cx, typ); }
107+
ty::TyRawPtr(mt) => { mywrite!(w, "*"); enc_mt(w, cx, mt); }
108+
ty::TyRef(r, mt) => {
109109
mywrite!(w, "&");
110110
enc_region(w, cx, *r);
111111
enc_mt(w, cx, mt);
112112
}
113-
ty::ty_vec(t, sz) => {
113+
ty::TyArray(t, sz) => {
114114
mywrite!(w, "V");
115115
enc_ty(w, cx, t);
116116
mywrite!(w, "/");
@@ -119,40 +119,40 @@ pub fn enc_ty<'a, 'tcx>(w: &mut Encoder, cx: &ctxt<'a, 'tcx>, t: Ty<'tcx>) {
119119
None => mywrite!(w, "|"),
120120
}
121121
}
122-
ty::ty_str => {
122+
ty::TyStr => {
123123
mywrite!(w, "v");
124124
}
125-
ty::ty_bare_fn(Some(def_id), f) => {
125+
ty::TyBareFn(Some(def_id), f) => {
126126
mywrite!(w, "F");
127127
mywrite!(w, "{}|", (cx.ds)(def_id));
128128
enc_bare_fn_ty(w, cx, f);
129129
}
130-
ty::ty_bare_fn(None, f) => {
130+
ty::TyBareFn(None, f) => {
131131
mywrite!(w, "G");
132132
enc_bare_fn_ty(w, cx, f);
133133
}
134-
ty::ty_infer(_) => {
134+
ty::TyInfer(_) => {
135135
cx.diag.handler().bug("cannot encode inference variable types");
136136
}
137-
ty::ty_param(ParamTy {space, idx, name}) => {
137+
ty::TyParam(ParamTy {space, idx, name}) => {
138138
mywrite!(w, "p[{}|{}|{}]", idx, space.to_uint(), token::get_name(name))
139139
}
140-
ty::ty_struct(def, substs) => {
140+
ty::TyStruct(def, substs) => {
141141
mywrite!(w, "a[{}|", (cx.ds)(def));
142142
enc_substs(w, cx, substs);
143143
mywrite!(w, "]");
144144
}
145-
ty::ty_closure(def, substs) => {
145+
ty::TyClosure(def, substs) => {
146146
mywrite!(w, "k[{}|", (cx.ds)(def));
147147
enc_substs(w, cx, substs);
148148
mywrite!(w, "]");
149149
}
150-
ty::ty_projection(ref data) => {
150+
ty::TyProjection(ref data) => {
151151
mywrite!(w, "P[");
152152
enc_trait_ref(w, cx, data.trait_ref);
153153
mywrite!(w, "{}]", token::get_name(data.item_name));
154154
}
155-
ty::ty_err => {
155+
ty::TyError => {
156156
mywrite!(w, "e");
157157
}
158158
}

‎branches/stable/src/librustc/middle/cast.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ impl<'tcx> CastTy<'tcx> {
6161
pub fn from_ty(tcx: &ty::ctxt<'tcx>, t: Ty<'tcx>)
6262
-> Option<CastTy<'tcx>> {
6363
match t.sty {
64-
ty::ty_bool => Some(CastTy::Int(IntTy::Bool)),
65-
ty::ty_char => Some(CastTy::Int(IntTy::Char)),
66-
ty::ty_int(_) => Some(CastTy::Int(IntTy::I)),
67-
ty::ty_uint(u) => Some(CastTy::Int(IntTy::U(u))),
68-
ty::ty_float(_) => Some(CastTy::Float),
69-
ty::ty_enum(..) if ty::type_is_c_like_enum(
64+
ty::TyBool => Some(CastTy::Int(IntTy::Bool)),
65+
ty::TyChar => Some(CastTy::Int(IntTy::Char)),
66+
ty::TyInt(_) => Some(CastTy::Int(IntTy::I)),
67+
ty::TyUint(u) => Some(CastTy::Int(IntTy::U(u))),
68+
ty::TyFloat(_) => Some(CastTy::Float),
69+
ty::TyEnum(..) if ty::type_is_c_like_enum(
7070
tcx, t) => Some(CastTy::Int(IntTy::CEnum)),
71-
ty::ty_ptr(ref mt) => Some(CastTy::Ptr(mt)),
72-
ty::ty_rptr(_, ref mt) => Some(CastTy::RPtr(mt)),
73-
ty::ty_bare_fn(..) => Some(CastTy::FnPtr),
71+
ty::TyRawPtr(ref mt) => Some(CastTy::Ptr(mt)),
72+
ty::TyRef(_, ref mt) => Some(CastTy::RPtr(mt)),
73+
ty::TyBareFn(..) => Some(CastTy::FnPtr),
7474
_ => None,
7575
}
7676
}

‎branches/stable/src/librustc/middle/check_const.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
423423
self.visit_expr(&**element);
424424
// The count is checked elsewhere (typeck).
425425
let count = match node_ty.sty {
426-
ty::ty_vec(_, Some(n)) => n,
426+
ty::TyArray(_, Some(n)) => n,
427427
_ => unreachable!()
428428
};
429429
// [element; 0] is always zero-sized.
@@ -454,7 +454,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
454454
visit::walk_expr(self, ex);
455455
let div_or_rem = op.node == ast::BiDiv || op.node == ast::BiRem;
456456
match node_ty.sty {
457-
ty::ty_uint(_) | ty::ty_int(_) if div_or_rem => {
457+
ty::TyUint(_) | ty::TyInt(_) if div_or_rem => {
458458
if !self.qualif.intersects(ConstQualif::NOT_CONST) {
459459
match const_eval::eval_const_expr_partial(self.tcx, ex, None) {
460460
Ok(_) => {}
@@ -529,8 +529,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
529529
fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>,
530530
e: &ast::Expr, node_ty: Ty<'tcx>) {
531531
match node_ty.sty {
532-
ty::ty_struct(did, _) |
533-
ty::ty_enum(did, _) if ty::has_dtor(v.tcx, did) => {
532+
ty::TyStruct(did, _) |
533+
ty::TyEnum(did, _) if ty::has_dtor(v.tcx, did) => {
534534
v.add_qualif(ConstQualif::NEEDS_DROP);
535535
if v.mode != Mode::Var {
536536
v.tcx.sess.span_err(e.span,
@@ -562,7 +562,7 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>,
562562
}
563563
ast::ExprUnary(op, ref inner) => {
564564
match ty::node_id_to_type(v.tcx, inner.id).sty {
565-
ty::ty_ptr(_) => {
565+
ty::TyRawPtr(_) => {
566566
assert!(op == ast::UnDeref);
567567

568568
v.add_qualif(ConstQualif::NOT_CONST);
@@ -576,7 +576,7 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>,
576576
}
577577
ast::ExprBinary(op, ref lhs, _) => {
578578
match ty::node_id_to_type(v.tcx, lhs.id).sty {
579-
ty::ty_ptr(_) => {
579+
ty::TyRawPtr(_) => {
580580
assert!(op.node == ast::BiEq || op.node == ast::BiNe ||
581581
op.node == ast::BiLe || op.node == ast::BiLt ||
582582
op.node == ast::BiGe || op.node == ast::BiGt);
@@ -612,7 +612,7 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>,
612612
v.add_qualif(ConstQualif::NON_ZERO_SIZED);
613613
}
614614
Some(def::DefStruct(_)) => {
615-
if let ty::ty_bare_fn(..) = node_ty.sty {
615+
if let ty::TyBareFn(..) = node_ty.sty {
616616
// Count the function pointer.
617617
v.add_qualif(ConstQualif::NON_ZERO_SIZED);
618618
}
@@ -854,7 +854,7 @@ impl<'a, 'tcx> euv::Delegate<'tcx> for CheckCrateVisitor<'a, 'tcx> {
854854
// Mutable slices are the only `&mut` allowed in globals,
855855
// but only in `static mut`, nowhere else.
856856
match cmt.ty.sty {
857-
ty::ty_vec(_, _) => break,
857+
ty::TyArray(_, _) => break,
858858
_ => {}
859859
}
860860
}

0 commit comments

Comments
 (0)