Skip to content

Commit 41e061b

Browse files
brsonbrson
committed
---
yaml --- r: 234859 b: refs/heads/stable c: 1f14e19 h: refs/heads/master i: 234857: 14156f1 234855: 81664a9 v: v3
1 parent dc7d2ac commit 41e061b

File tree

13 files changed

+24
-131
lines changed

13 files changed

+24
-131
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: eeeda89e557d1bbf927698f38fd2d4fc6b185d9c
32+
refs/heads/stable: 1f14e195b4ba526afc7b3696d04e6992f23b0298
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/configure

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,14 +1037,6 @@ for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
10371037
CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
10381038
done
10391039

1040-
# copy build-triples to host-triples so that builds are a subset of hosts
1041-
V_TEMP=""
1042-
for i in $CFG_BUILD $CFG_HOST;
1043-
do
1044-
echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
1045-
done
1046-
CFG_HOST=$V_TEMP
1047-
10481040
# copy host-triples to target-triples so that hosts are a subset of targets
10491041
V_TEMP=""
10501042
for i in $CFG_HOST $CFG_TARGET;

‎branches/stable/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=1.2.0
16+
CFG_RELEASE_NUM=1.3.0
1717

1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release

‎branches/stable/src/doc/trpl/documentation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ we could have added more explanation in a new paragraph.
102102
#### Special sections
103103

104104
Next, are special sections. These are indicated with a header, `#`. There
105-
are four kinds of headers that are commonly used. They aren't special syntax,
105+
are three kinds of headers that are commonly used. They aren't special syntax,
106106
just convention, for now.
107107

108108
```rust
@@ -144,7 +144,7 @@ responsible for upholding.
144144
# fn foo() {}
145145
```
146146

147-
Fourth, `Examples`. Include one or more examples of using your function or
147+
Third, `Examples`. Include one or more examples of using your function or
148148
method, and your users will love you for it. These examples go inside of
149149
code block annotations, which we'll talk about in a moment, and can have
150150
more than one section:

‎branches/stable/src/doc/trpl/installing-rust.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ $ sudo /usr/local/lib/rustlib/uninstall.sh
4141
If you used the Windows installer, just re-run the `.msi` and it will give you
4242
an uninstall option.
4343

44-
## That disclaimer we promised
45-
4644
Some people, and somewhat rightfully so, get very upset when we tell you to
4745
`curl | sh`. Basically, when you do this, you are trusting that the good
4846
people who maintain Rust aren't going to hack your computer and do bad things.
@@ -52,8 +50,6 @@ binary downloads][install-page].
5250

5351
[from-source]: https://github.com/rust-lang/rust#building-from-source
5452

55-
## Platform support
56-
5753
Oh, we should also mention the officially supported platforms:
5854

5955
* Windows (7, 8, Server 2008 R2)
@@ -70,8 +66,6 @@ integrated as the Linux/OS X experience is. We're working on it! If anything
7066
does not work, it is a bug. Please let us know if that happens. Each and every
7167
commit is tested against Windows just like any other platform.
7268

73-
## After installation
74-
7569
If you've got Rust installed, you can open up a shell, and type this:
7670

7771
```bash

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,12 @@ pub mod types {
441441
pub type intmax_t = i64;
442442
pub type uintmax_t = u64;
443443
}
444-
#[cfg(any(target_arch = "mips",
444+
#[cfg(any(target_arch = "x86",
445+
target_arch = "mips",
445446
target_arch = "mipsel",
446447
target_arch = "powerpc",
447448
target_arch = "le32",
448-
all(any(target_arch = "arm", target_arch = "x86"),
449-
not(target_os = "android"))))]
449+
all(target_arch = "arm", not(target_os = "android"))))]
450450
pub mod posix88 {
451451
pub type off_t = i32;
452452
pub type dev_t = u64;
@@ -458,8 +458,7 @@ pub mod types {
458458
pub type mode_t = u32;
459459
pub type ssize_t = i32;
460460
}
461-
#[cfg(all(any(target_arch = "arm", target_arch = "x86"),
462-
target_os = "android"))]
461+
#[cfg(all(target_arch = "arm", target_os = "android"))]
463462
pub mod posix88 {
464463
pub type off_t = i32;
465464
pub type dev_t = u32;
@@ -474,8 +473,7 @@ pub mod types {
474473
#[cfg(any(target_arch = "x86",
475474
target_arch = "le32",
476475
target_arch = "powerpc",
477-
all(any(target_arch = "arm", target_arch = "x86"),
478-
not(target_os = "android"))))]
476+
all(target_arch = "arm", not(target_os = "android"))))]
479477
pub mod posix01 {
480478
use types::os::arch::c95::{c_short, c_long, time_t};
481479
use types::os::arch::posix88::{dev_t, gid_t, ino_t};
@@ -521,8 +519,7 @@ pub mod types {
521519
pub __size: [u32; 9]
522520
}
523521
}
524-
#[cfg(all(any(target_arch = "arm", target_arch = "x86"),
525-
target_os = "android"))]
522+
#[cfg(all(target_arch = "arm", target_os = "android"))]
526523
pub mod posix01 {
527524
use types::os::arch::c95::{c_uchar, c_uint, c_ulong, time_t};
528525
use types::os::arch::c99::{c_longlong, c_ulonglong};
@@ -5919,15 +5916,13 @@ pub mod funcs {
59195916
use types::os::arch::c95::c_int;
59205917
use types::os::common::posix01::sighandler_t;
59215918

5922-
#[cfg(not(all(target_os = "android", any(target_arch = "arm",
5923-
target_arch = "x86"))))]
5919+
#[cfg(not(all(target_os = "android", target_arch = "arm")))]
59245920
extern {
59255921
pub fn signal(signum: c_int,
59265922
handler: sighandler_t) -> sighandler_t;
59275923
}
59285924

5929-
#[cfg(all(target_os = "android", any(target_arch = "arm",
5930-
target_arch = "x86")))]
5925+
#[cfg(all(target_os = "android", target_arch = "arm"))]
59315926
extern {
59325927
#[link_name = "bsd_signal"]
59335928
pub fn signal(signum: c_int,

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

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use syntax::feature_gate::emit_feature_err;
3030
use util::nodemap::{DefIdMap, FnvHashSet, FnvHashMap};
3131

3232
use std::mem::replace;
33-
use std::cmp::Ordering;
3433

3534
/// A stability index, giving the stability level for items and methods.
3635
pub struct Index<'tcx> {
@@ -60,57 +59,9 @@ impl<'a, 'tcx: 'a> Annotator<'a, 'tcx> {
6059
if self.index.staged_api[&ast::LOCAL_CRATE] {
6160
debug!("annotate(id = {:?}, attrs = {:?})", id, attrs);
6261
match attr::find_stability(self.tcx.sess.diagnostic(), attrs, item_sp) {
63-
Some(mut stab) => {
62+
Some(stab) => {
6463
debug!("annotate: found {:?}", stab);
65-
// if parent is deprecated and we're not, inherit this by merging
66-
// deprecated_since and its reason.
67-
if let Some(parent_stab) = self.parent {
68-
if parent_stab.deprecated_since.is_some()
69-
&& stab.deprecated_since.is_none() {
70-
stab.deprecated_since = parent_stab.deprecated_since.clone();
71-
stab.reason = parent_stab.reason.clone();
72-
}
73-
}
74-
7564
let stab = self.tcx.intern_stability(stab);
76-
77-
// Check if deprecated_since < stable_since. If it is,
78-
// this is *almost surely* an accident.
79-
let deprecated_predates_stable = match (stab.deprecated_since.as_ref(),
80-
stab.since.as_ref()) {
81-
(Some(dep_since), Some(stab_since)) => {
82-
// explicit version of iter::order::lt to handle parse errors properly
83-
let mut is_less = false;
84-
for (dep_v, stab_v) in dep_since.split(".").zip(stab_since.split(".")) {
85-
match (dep_v.parse::<u64>(), stab_v.parse::<u64>()) {
86-
(Ok(dep_v), Ok(stab_v)) => match dep_v.cmp(&stab_v) {
87-
Ordering::Less => {
88-
is_less = true;
89-
break;
90-
}
91-
Ordering::Equal => { continue; }
92-
Ordering::Greater => { break; }
93-
},
94-
_ => {
95-
self.tcx.sess.span_err(item_sp,
96-
"Invalid stability or deprecation version found");
97-
// act like it isn't less because the question is now
98-
// nonsensical, and this makes us not do anything else
99-
// interesting.
100-
break;
101-
}
102-
}
103-
}
104-
is_less
105-
},
106-
_ => false,
107-
};
108-
109-
if deprecated_predates_stable {
110-
self.tcx.sess.span_err(item_sp,
111-
"An API can't be stabilized after it is deprecated");
112-
}
113-
11465
self.index.map.insert(local_def(id), Some(stab));
11566

11667
// Don't inherit #[stable(feature = "rust1", since = "1.0.0")]

‎branches/stable/src/libstd/sys/windows/os.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,6 @@ impl ExactSizeIterator for Args {
311311

312312
impl Drop for Args {
313313
fn drop(&mut self) {
314-
// self.cur can be null if CommandLineToArgvW previously failed,
315-
// but LocalFree ignores NULL pointers
316314
unsafe { c::LocalFree(self.cur as *mut c_void); }
317315
}
318316
}
@@ -323,9 +321,6 @@ pub fn args() -> Args {
323321
let lpCmdLine = c::GetCommandLineW();
324322
let szArgList = c::CommandLineToArgvW(lpCmdLine, &mut nArgs);
325323

326-
// szArcList can be NULL if CommandLinToArgvW failed,
327-
// but in that case nArgs is 0 so we won't actually
328-
// try to read a null pointer
329324
Args { cur: szArgList, range: 0..(nArgs as isize) }
330325
}
331326
}

‎branches/stable/src/libstd/tuple.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
//! * `Eq`
2626
//! * `PartialOrd`
2727
//! * `Ord`
28-
//! * `Debug`
2928
//! * `Default`
30-
//! * `Hash`
3129
//!
3230
//! # Examples
3331
//!

‎branches/stable/src/libsyntax/attr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ fn find_stability_generic<'a,
397397
-> (Option<Stability>, Vec<&'a AM>) {
398398

399399
let mut stab: Option<Stability> = None;
400-
let mut deprecated: Option<(Option<InternedString>, Option<InternedString>)> = None;
400+
let mut deprecated: Option<(InternedString, Option<InternedString>)> = None;
401401
let mut used_attrs: Vec<&'a AM> = vec![];
402402

403403
'outer: for attr in attrs {
@@ -484,7 +484,7 @@ fn find_stability_generic<'a,
484484
diagnostic.span_err(item_sp, "multiple deprecated attributes");
485485
}
486486

487-
deprecated = Some((since, reason));
487+
deprecated = Some((since.unwrap_or(intern_and_get_ident("bogus")), reason));
488488
}
489489
}
490490

@@ -493,7 +493,7 @@ fn find_stability_generic<'a,
493493
match stab {
494494
Some(ref mut s) => {
495495
let (since, reason) = deprecated.unwrap();
496-
s.deprecated_since = since;
496+
s.deprecated_since = Some(since);
497497
s.reason = reason;
498498
}
499499
None => {

‎branches/stable/src/test/compile-fail/lint-stability-fields.rs

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,14 @@ mod cross_crate {
116116
//~^ ERROR use of deprecated item
117117
//~^^ ERROR use of unstable
118118
override1: 2,
119-
//~^ ERROR use of deprecated item
120-
override2: 3,
121-
//~^ ERROR use of deprecated item
122-
//~^^ ERROR use of unstable
119+
override2: 3, //~ ERROR use of unstable
123120
};
124121

125122
let _ = x.inherit;
126123
//~^ ERROR use of deprecated item
127124
//~^^ ERROR use of unstable
128125
let _ = x.override1;
129-
//~^ ERROR use of deprecated item
130-
let _ = x.override2;
131-
//~^ ERROR use of deprecated item
132-
//~^^ ERROR use of unstable
126+
let _ = x.override2; //~ ERROR use of unstable
133127

134128
let Deprecated {
135129
//~^ ERROR use of deprecated item
@@ -138,10 +132,7 @@ mod cross_crate {
138132
//~^ ERROR use of deprecated item
139133
//~^^ ERROR use of unstable
140134
override1: _,
141-
//~^ ERROR use of deprecated item
142-
override2: _
143-
//~^ ERROR use of unstable
144-
//~^^ ERROR use of deprecated item
135+
override2: _ //~ ERROR use of unstable
145136
} = x;
146137

147138
let Deprecated
@@ -158,10 +149,7 @@ mod cross_crate {
158149
//~^ ERROR use of deprecated item
159150
//~^^ ERROR use of unstable
160151
let _ = x.1;
161-
//~^ ERROR use of deprecated item
162-
let _ = x.2;
163-
//~^ ERROR use of deprecated item
164-
//~^^ ERROR use of unstable
152+
let _ = x.2; //~ ERROR use of unstable
165153

166154
let Deprecated2
167155
//~^ ERROR use of deprecated item
@@ -170,10 +158,7 @@ mod cross_crate {
170158
//~^ ERROR use of deprecated item
171159
//~^^ ERROR use of unstable
172160
_,
173-
//~^ ERROR use of deprecated item
174-
_)
175-
//~^ ERROR use of deprecated item
176-
//~^^ ERROR use of unstable
161+
_) //~ ERROR use of unstable
177162
= x;
178163
let Deprecated2
179164
//~^ ERROR use of deprecated item
@@ -315,26 +300,20 @@ mod this_crate {
315300
inherit: 1,
316301
//~^ ERROR use of deprecated item
317302
override1: 2,
318-
//~^ ERROR use of deprecated item
319303
override2: 3,
320-
//~^ ERROR use of deprecated item
321304
};
322305

323306
let _ = x.inherit;
324307
//~^ ERROR use of deprecated item
325308
let _ = x.override1;
326-
//~^ ERROR use of deprecated item
327309
let _ = x.override2;
328-
//~^ ERROR use of deprecated item
329310

330311
let Deprecated {
331312
//~^ ERROR use of deprecated item
332313
inherit: _,
333314
//~^ ERROR use of deprecated item
334315
override1: _,
335-
//~^ ERROR use of deprecated item
336316
override2: _
337-
//~^ ERROR use of deprecated item
338317
} = x;
339318

340319
let Deprecated
@@ -348,18 +327,14 @@ mod this_crate {
348327
let _ = x.0;
349328
//~^ ERROR use of deprecated item
350329
let _ = x.1;
351-
//~^ ERROR use of deprecated item
352330
let _ = x.2;
353-
//~^ ERROR use of deprecated item
354331

355332
let Deprecated2
356333
//~^ ERROR use of deprecated item
357334
(_,
358335
//~^ ERROR use of deprecated item
359336
_,
360-
//~^ ERROR use of deprecated item
361337
_)
362-
//~^ ERROR use of deprecated item
363338
= x;
364339
let Deprecated2
365340
//~^ ERROR use of deprecated item

‎branches/stable/src/test/compile-fail/lint-stability.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,8 @@ mod cross_crate {
128128
<Foo as Trait>::trait_stable_text(&foo);
129129

130130
let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
131-
let _ = DeprecatedUnstableStruct {
132-
//~^ ERROR use of deprecated item
133-
//~^^ ERROR use of unstable library feature
134-
i: 0 //~ ERROR use of deprecated item
135-
};
131+
let _ = DeprecatedUnstableStruct { i: 0 }; //~ ERROR use of deprecated item
132+
//~^ ERROR use of unstable library feature
136133
let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable library feature
137134
let _ = StableStruct { i: 0 };
138135

@@ -420,10 +417,7 @@ mod this_crate {
420417
<Foo>::trait_stable_text(&foo);
421418
<Foo as Trait>::trait_stable_text(&foo);
422419

423-
let _ = DeprecatedStruct {
424-
//~^ ERROR use of deprecated item
425-
i: 0 //~ ERROR use of deprecated item
426-
};
420+
let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
427421
let _ = UnstableStruct { i: 0 };
428422
let _ = StableStruct { i: 0 };
429423

0 commit comments

Comments
 (0)