bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Deprecated attributes don't take 'feature' names and are paired with stable/unstable

Browse source 
Conflicts:
	src/libcore/atomic.rs
	src/libcore/finally.rs
	src/test/auxiliary/inherited_stability.rs
	src/test/auxiliary/lint_stability.rs
This commit is contained in:
Brian Anderson 2015-01-22 12:33:46 -08:00
parent cd6d9eab5d
commit 9758c488a9
39 changed files with 437 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/etc/featureck.py
View file

@ -84,8 +84,6 @@ for (dirpath, dirnames, filenames) in os.walk(src_dir):
level = "unstable" level = "unstable"
elif "[stable(" in line: elif "[stable(" in line:
level = "stable" level = "stable"
elif "[deprecated(" in line:
level = "deprecated"
else: else:
continue continue
@ -94,12 +92,12 @@ for (dirpath, dirnames, filenames) in os.walk(src_dir):
# the same line, e.g. # the same line, e.g.
# `#[unstable(feature = "foo", since = "1.0.0")]` # `#[unstable(feature = "foo", since = "1.0.0")]`
p = re.compile('(unstable|stable|deprecated).*feature *= *"(\w*)"') p = re.compile('(unstable|stable).*feature *= *"(\w*)"')
m = p.search(line) m = p.search(line)
if not m is None: if not m is None:
feature_name = m.group(2) feature_name = m.group(2)
since = None since = None
if "stable" in line or "deprecated" in line: if "stable" in line:
pp = re.compile('since *= *"([\w\.]*)"') pp = re.compile('since *= *"([\w\.]*)"')
mm = pp.search(line) mm = pp.search(line)
since = m.group(1) since = m.group(1)
@ -135,7 +133,7 @@ for (dirpath, dirnames, filenames) in os.walk(src_dir):
errors = True errors = True
# Merge data about both lists # Merge data about both lists
# name, lang, lib, status, stable since, partially deprecated # name, lang, lib, status, stable since
language_feature_stats = {} language_feature_stats = {}
@ -145,15 +143,13 @@ for f in language_features:
lib = False lib = False
status = "unstable" status = "unstable"
stable_since = None stable_since = None
partially_deprecated = False
if f[2] == "Accepted": if f[2] == "Accepted":
status = "stable" status = "stable"
if status == "stable": if status == "stable":
stable_since = f[1] stable_since = f[1]
language_feature_stats[name] = (name, lang, lib, status, stable_since, \ language_feature_stats[name] = (name, lang, lib, status, stable_since)
partially_deprecated)
lib_feature_stats = {} lib_feature_stats = {}
@ -163,11 +159,9 @@ for f in lib_features:
lib = True lib = True
status = "unstable" status = "unstable"
stable_since = None stable_since = None
partially_deprecated = False
is_stable = lib_features_and_level.get((name, "stable")) is not None is_stable = lib_features_and_level.get((name, "stable")) is not None
is_unstable = lib_features_and_level.get((name, "unstable")) is not None is_unstable = lib_features_and_level.get((name, "unstable")) is not None
is_deprecated = lib_features_and_level.get((name, "deprecated")) is not None
if is_stable and is_unstable: if is_stable and is_unstable:
print "error: feature '" + name + "' is both stable and unstable" print "error: feature '" + name + "' is both stable and unstable"
@ -179,14 +173,8 @@ for f in lib_features:
elif is_unstable: elif is_unstable:
status = "unstable" status = "unstable"
stable_since = lib_features_and_level[(name, "unstable")][0] stable_since = lib_features_and_level[(name, "unstable")][0]
elif is_deprecated:
status = "deprecated"
if (is_stable or is_unstable) and is_deprecated: lib_feature_stats[name] = (name, lang, lib, status, stable_since)
partially_deprecated = True
lib_feature_stats[name] = (name, lang, lib, status, stable_since, \
partially_deprecated)
# Check for overlap in two sets # Check for overlap in two sets
merged_stats = { } merged_stats = { }
@ -200,25 +188,18 @@ for name in lib_feature_stats:
lib_status = lib_feature_stats[name][3] lib_status = lib_feature_stats[name][3]
lang_stable_since = lang_feature_stats[name][4] lang_stable_since = lang_feature_stats[name][4]
lib_stable_since = lib_feature_stats[name][4] lib_stable_since = lib_feature_stats[name][4]
lang_partially_deprecated = lang_feature_stats[name][5]
lib_partially_deprecated = lib_feature_stats[name][5]
if lang_status != lib_status and lib_status != "deprecated": if lang_status != lib_status and lib_status != "deprecated":
print "error: feature '" + name + "' has lang status " + lang_status + \ print "error: feature '" + name + "' has lang status " + lang_status + \
" but lib status " + lib_status " but lib status " + lib_status
errors = True errors = True
partially_deprecated = lang_partially_deprecated or lib_partially_deprecated
if lib_status == "deprecated" and lang_status != "deprecated":
partially_deprecated = True
if lang_stable_since != lib_stable_since: if lang_stable_since != lib_stable_since:
print "error: feature '" + name + "' has lang stable since " + lang_stable_since + \ print "error: feature '" + name + "' has lang stable since " + lang_stable_since + \
" but lib stable since " + lib_stable_since " but lib stable since " + lib_stable_since
errors = True errors = True
merged_stats[name] = (name, True, True, lang_status, lang_stable_since, \ merged_stats[name] = (name, True, True, lang_status, lang_stable_since)
partially_deprecated)
del language_feature_stats[name] del language_feature_stats[name]
del lib_feature_stats[name] del lib_feature_stats[name]
@ -244,8 +225,6 @@ for s in stats:
"{: <8}".format(type_) + \ "{: <8}".format(type_) + \
"{: <12}".format(s[3]) + \ "{: <12}".format(s[3]) + \
"{: <8}".format(str(s[4])) "{: <8}".format(str(s[4]))
if s[5]:
line += "(partially deprecated)"
lines += [line] lines += [line]
lines.sort() lines.sort()

2
src/libarena/lib.rs
View file

@ -37,6 +37,8 @@
#![allow(missing_docs)] #![allow(missing_docs)]
#![feature(alloc)] #![feature(alloc)]
#![feature(core)] #![feature(core)]
#![cfg_attr(test, feature(test))]
#![cfg_attr(test, feature(collections))]
extern crate alloc; extern crate alloc;

1
src/libcollections/lib.rs
View file

@ -33,6 +33,7 @@
#![feature(alloc)] #![feature(alloc)]
#![feature(unicode)] #![feature(unicode)]
#![feature(hash)] #![feature(hash)]
#![cfg_attr(test, feature(test))]
#[macro_use] #[macro_use]
extern crate core; extern crate core;

3
src/libcollections/slice.rs
View file

@ -642,7 +642,8 @@ pub trait SliceExt {
fn binary_search(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord; fn binary_search(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord;
/// Deprecated: use `binary_search` instead. /// Deprecated: use `binary_search` instead.
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "use binary_search instead")] #[unstable(feature = "collections")]
#[deprecated(since = "1.0.0", reason = "use binary_search instead")]
fn binary_search_elem(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord { fn binary_search_elem(&self, x: &Self::Item) -> Result<uint, uint> where Self::Item: Ord {
self.binary_search(x) self.binary_search(x)
} }

12
src/libcore/atomic.rs
View file

@ -1036,7 +1036,8 @@ pub fn fence(order: Ordering) {
} }
} }
#[deprecated(feature = "core", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "renamed to AtomicIsize")] reason = "renamed to AtomicIsize")]
#[allow(missing_docs)] #[allow(missing_docs)]
pub struct AtomicInt { pub struct AtomicInt {
@ -1045,7 +1046,8 @@ pub struct AtomicInt {
unsafe impl Sync for AtomicInt {} unsafe impl Sync for AtomicInt {}
#[deprecated(feature = "core", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "renamed to AtomicUsize")] reason = "renamed to AtomicUsize")]
#[allow(missing_docs)] #[allow(missing_docs)]
pub struct AtomicUint { pub struct AtomicUint {
@ -1054,12 +1056,14 @@ pub struct AtomicUint {
unsafe impl Sync for AtomicUint {} unsafe impl Sync for AtomicUint {}
#[deprecated(feature = "core", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use ATOMIC_ISIZE_INIT instead")] reason = "use ATOMIC_ISIZE_INIT instead")]
#[allow(missing_docs, deprecated)] #[allow(missing_docs, deprecated)]
pub const ATOMIC_INT_INIT: AtomicInt = pub const ATOMIC_INT_INIT: AtomicInt =
AtomicInt { v: UnsafeCell { value: 0 } }; AtomicInt { v: UnsafeCell { value: 0 } };
#[deprecated(feature = "core", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use ATOMIC_USIZE_INIT instead")] reason = "use ATOMIC_USIZE_INIT instead")]
#[allow(missing_docs, deprecated)] #[allow(missing_docs, deprecated)]
pub const ATOMIC_UINT_INIT: AtomicUint = pub const ATOMIC_UINT_INIT: AtomicUint =

3
src/libcore/finally.rs
View file

@ -30,7 +30,8 @@
//! }) //! })
//! ``` //! ```
#![deprecated(feature = "core", since = "1.0.0", #![unstable(feature = "core")]
#![deprecated(since = "1.0.0",
reason = "It is unclear if this module is more robust than implementing \ reason = "It is unclear if this module is more robust than implementing \
Drop on a custom type, and this module is being removed with no \ Drop on a custom type, and this module is being removed with no \
replacement. Use a custom Drop implementation to regain existing \ replacement. Use a custom Drop implementation to regain existing \

3
src/libcore/hash/sip.rs
View file

@ -112,7 +112,8 @@ impl SipHasher {
} }
/// Returns the computed hash. /// Returns the computed hash.
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "renamed to finish")] #[unstable(feature = "hash")]
#[deprecated(since = "1.0.0", reason = "renamed to finish")]
pub fn result(&self) -> u64 { self.finish() } pub fn result(&self) -> u64 { self.finish() }
} }

30
src/libcore/num/f32.rs
View file

@ -178,43 +178,53 @@ impl Float for f32 {
} }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn mantissa_digits(_: Option<f32>) -> uint { MANTISSA_DIGITS } fn mantissa_digits(_: Option<f32>) -> uint { MANTISSA_DIGITS }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn digits(_: Option<f32>) -> uint { DIGITS } fn digits(_: Option<f32>) -> uint { DIGITS }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn epsilon() -> f32 { EPSILON } fn epsilon() -> f32 { EPSILON }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_exp(_: Option<f32>) -> int { MIN_EXP } fn min_exp(_: Option<f32>) -> int { MIN_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_exp(_: Option<f32>) -> int { MAX_EXP } fn max_exp(_: Option<f32>) -> int { MAX_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_10_exp(_: Option<f32>) -> int { MIN_10_EXP } fn min_10_exp(_: Option<f32>) -> int { MIN_10_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_10_exp(_: Option<f32>) -> int { MAX_10_EXP } fn max_10_exp(_: Option<f32>) -> int { MAX_10_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_value() -> f32 { MIN_VALUE } fn min_value() -> f32 { MIN_VALUE }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_pos_value(_: Option<f32>) -> f32 { MIN_POS_VALUE } fn min_pos_value(_: Option<f32>) -> f32 { MIN_POS_VALUE }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_value() -> f32 { MAX_VALUE } fn max_value() -> f32 { MAX_VALUE }
/// Returns the mantissa, exponent and sign as integers. /// Returns the mantissa, exponent and sign as integers.

30
src/libcore/num/f64.rs
View file

@ -185,43 +185,53 @@ impl Float for f64 {
} }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn mantissa_digits(_: Option<f64>) -> uint { MANTISSA_DIGITS } fn mantissa_digits(_: Option<f64>) -> uint { MANTISSA_DIGITS }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn digits(_: Option<f64>) -> uint { DIGITS } fn digits(_: Option<f64>) -> uint { DIGITS }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn epsilon() -> f64 { EPSILON } fn epsilon() -> f64 { EPSILON }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_exp(_: Option<f64>) -> int { MIN_EXP } fn min_exp(_: Option<f64>) -> int { MIN_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_exp(_: Option<f64>) -> int { MAX_EXP } fn max_exp(_: Option<f64>) -> int { MAX_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_10_exp(_: Option<f64>) -> int { MIN_10_EXP } fn min_10_exp(_: Option<f64>) -> int { MIN_10_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_10_exp(_: Option<f64>) -> int { MAX_10_EXP } fn max_10_exp(_: Option<f64>) -> int { MAX_10_EXP }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_value() -> f64 { MIN_VALUE } fn min_value() -> f64 { MIN_VALUE }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn min_pos_value(_: Option<f64>) -> f64 { MIN_POS_VALUE } fn min_pos_value(_: Option<f64>) -> f64 { MIN_POS_VALUE }
#[inline] #[inline]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "core")]
#[deprecated(since = "1.0.0")]
fn max_value() -> f64 { MAX_VALUE } fn max_value() -> f64 { MAX_VALUE }
/// Returns the mantissa, exponent and sign as integers. /// Returns the mantissa, exponent and sign as integers.

3
src/libcore/num/int.rs
View file

@ -14,7 +14,8 @@
//! alpha cycle along with the development of clearer conventions //! alpha cycle along with the development of clearer conventions
//! around integer types. //! around integer types.
#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by isize")] #![unstable(feature = "core")]
#![deprecated(since = "1.0.0", reason = "replaced by isize")]
#[cfg(target_pointer_width = "32")] int_module! { int, 32 } #[cfg(target_pointer_width = "32")] int_module! { int, 32 }
#[cfg(target_pointer_width = "64")] int_module! { int, 64 } #[cfg(target_pointer_width = "64")] int_module! { int, 64 }

30
src/libcore/num/mod.rs
View file

@ -1292,45 +1292,55 @@ pub trait Float
// FIXME (#5527): These should be associated constants // FIXME (#5527): These should be associated constants
/// Returns the number of binary digits of mantissa that this type supports. /// Returns the number of binary digits of mantissa that this type supports.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MANTISSA_DIGITS` or \ reason = "use `std::f32::MANTISSA_DIGITS` or \
`std::f64::MANTISSA_DIGITS` as appropriate")] `std::f64::MANTISSA_DIGITS` as appropriate")]
fn mantissa_digits(unused_self: Option<Self>) -> uint; fn mantissa_digits(unused_self: Option<Self>) -> uint;
/// Returns the number of base-10 digits of precision that this type supports. /// Returns the number of base-10 digits of precision that this type supports.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")] reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")]
fn digits(unused_self: Option<Self>) -> uint; fn digits(unused_self: Option<Self>) -> uint;
/// Returns the difference between 1.0 and the smallest representable number larger than 1.0. /// Returns the difference between 1.0 and the smallest representable number larger than 1.0.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")] reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")]
fn epsilon() -> Self; fn epsilon() -> Self;
/// Returns the minimum binary exponent that this type can represent. /// Returns the minimum binary exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")] reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")]
fn min_exp(unused_self: Option<Self>) -> int; fn min_exp(unused_self: Option<Self>) -> int;
/// Returns the maximum binary exponent that this type can represent. /// Returns the maximum binary exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")] reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")]
fn max_exp(unused_self: Option<Self>) -> int; fn max_exp(unused_self: Option<Self>) -> int;
/// Returns the minimum base-10 exponent that this type can represent. /// Returns the minimum base-10 exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")] reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")]
fn min_10_exp(unused_self: Option<Self>) -> int; fn min_10_exp(unused_self: Option<Self>) -> int;
/// Returns the maximum base-10 exponent that this type can represent. /// Returns the maximum base-10 exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")] reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")]
fn max_10_exp(unused_self: Option<Self>) -> int; fn max_10_exp(unused_self: Option<Self>) -> int;
/// Returns the smallest finite value that this type can represent. /// Returns the smallest finite value that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_VALUE` or `std::f64::MIN_VALUE` as appropriate")] reason = "use `std::f32::MIN_VALUE` or `std::f64::MIN_VALUE` as appropriate")]
fn min_value() -> Self; fn min_value() -> Self;
/// Returns the smallest normalized positive number that this type can represent. /// Returns the smallest normalized positive number that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_POS_VALUE` or \ reason = "use `std::f32::MIN_POS_VALUE` or \
`std::f64::MIN_POS_VALUE` as appropriate")] `std::f64::MIN_POS_VALUE` as appropriate")]
fn min_pos_value(unused_self: Option<Self>) -> Self; fn min_pos_value(unused_self: Option<Self>) -> Self;
/// Returns the largest finite value that this type can represent. /// Returns the largest finite value that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MAX_VALUE` or `std::f64::MAX_VALUE` as appropriate")] reason = "use `std::f32::MAX_VALUE` or `std::f64::MAX_VALUE` as appropriate")]
fn max_value() -> Self; fn max_value() -> Self;

3
src/libcore/num/uint.rs
View file

@ -14,6 +14,7 @@
//! alpha cycle along with the development of clearer conventions //! alpha cycle along with the development of clearer conventions
//! around integer types. //! around integer types.
#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by usize")] #![unstable(feature = "core")]
#![deprecated(since = "1.0.0", reason = "replaced by usize")]
uint_module! { uint, int, ::int::BITS } uint_module! { uint, int, ::int::BITS }

3
src/libcore/str/mod.rs
View file

@ -195,7 +195,8 @@ pub unsafe fn from_utf8_unchecked<'a>(v: &'a [u8]) -> &'a str {
/// # Panics /// # Panics
/// ///
/// This function will panic if the string pointed to by `s` is not valid UTF-8. /// This function will panic if the string pointed to by `s` is not valid UTF-8.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "core")]
#[deprecated(since = "1.0.0",
reason = "use std::ffi::c_str_to_bytes + str::from_utf8")] reason = "use std::ffi::c_str_to_bytes + str::from_utf8")]
pub unsafe fn from_c_str(s: *const i8) -> &'static str { pub unsafe fn from_c_str(s: *const i8) -> &'static str {
let s = s as *const u8; let s = s as *const u8;

4
src/libgetopts/lib.rs
View file

@ -93,6 +93,7 @@
#![deny(missing_docs)] #![deny(missing_docs)]
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![cfg_attr(test, feature(rustc_private))]
#[cfg(test)] #[macro_use] extern crate log; #[cfg(test)] #[macro_use] extern crate log;
@ -541,7 +542,8 @@ pub fn opt(short_name: &str,
impl Fail { impl Fail {
/// Convert a `Fail` enum into an error string. /// Convert a `Fail` enum into an error string.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "rustc_private")]
#[deprecated(since = "1.0.0",
reason = "use `fmt::String` (`{}` format specifier)")] reason = "use `fmt::String` (`{}` format specifier)")]
pub fn to_err_msg(self) -> String { pub fn to_err_msg(self) -> String {
self.to_string() self.to_string()

3
src/libgraphviz/maybe_owned_vec.rs
View file

@ -8,7 +8,8 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "use std::vec::CowVec")] #![unstable(feature = "rustc_private")]
#![deprecated(since = "1.0.0", reason = "use std::vec::CowVec")]
pub use self::MaybeOwnedVector::*; pub use self::MaybeOwnedVector::*;

1
src/liblibc/lib.rs
View file

@ -21,6 +21,7 @@
html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://doc.rust-lang.org/nightly/", html_root_url = "http://doc.rust-lang.org/nightly/",
html_playground_url = "http://play.rust-lang.org/")] html_playground_url = "http://play.rust-lang.org/")]
#![cfg_attr(test, feature(test))]
//! Bindings for the C standard library and other platform libraries //! Bindings for the C standard library and other platform libraries
//! //!

2
src/librustc/lint/builtin.rs
View file

@ -1637,7 +1637,7 @@ impl Stability {
// deprecated attributes apply in-crate and cross-crate // deprecated attributes apply in-crate and cross-crate
let (lint, label) = match *stability { let (lint, label) = match *stability {
Some(attr::Stability { level: attr::Deprecated, .. }) => Some(attr::Stability { deprecated_since: Some(_), .. }) =>
(DEPRECATED, "deprecated"), (DEPRECATED, "deprecated"),
_ => return _ => return
}; };

31
src/librustc/middle/stability.rs
View file

@ -52,10 +52,10 @@ impl<'a> Annotator<'a> {
// Determine the stability for a node based on its attributes and inherited // Determine the stability for a node based on its attributes and inherited
// stability. The stability is recorded in the index and used as the parent. // stability. The stability is recorded in the index and used as the parent.
fn annotate<F>(&mut self, id: NodeId, use_parent: bool, fn annotate<F>(&mut self, id: NodeId, use_parent: bool,
attrs: &Vec<Attribute>, f: F) where attrs: &Vec<Attribute>, item_sp: Span, f: F) where
F: FnOnce(&mut Annotator), F: FnOnce(&mut Annotator),
{ {
match attr::find_stability(self.sess.diagnostic(), attrs.as_slice()) { match attr::find_stability(self.sess.diagnostic(), attrs.as_slice(), item_sp) {
Some(stab) => { Some(stab) => {
self.index.local.insert(id, stab.clone()); self.index.local.insert(id, stab.clone());
@ -93,53 +93,54 @@ impl<'a, 'v> Visitor<'v> for Annotator<'a> {
_ => true, _ => true,
}; };
self.annotate(i.id, use_parent, &i.attrs, |v| visit::walk_item(v, i)); self.annotate(i.id, use_parent, &i.attrs, i.span, |v| visit::walk_item(v, i));
if let ast::ItemStruct(ref sd, _) = i.node { if let ast::ItemStruct(ref sd, _) = i.node {
sd.ctor_id.map(|id| { sd.ctor_id.map(|id| {
self.annotate(id, true, &i.attrs, |_| {}) self.annotate(id, true, &i.attrs, i.span, |_| {})
}); });
} }
} }
fn visit_fn(&mut self, fk: FnKind<'v>, _: &'v FnDecl, fn visit_fn(&mut self, fk: FnKind<'v>, _: &'v FnDecl,
_: &'v Block, _: Span, _: NodeId) { _: &'v Block, sp: Span, _: NodeId) {
if let FkMethod(_, _, meth) = fk { if let FkMethod(_, _, meth) = fk {
// Methods are not already annotated, so we annotate it // Methods are not already annotated, so we annotate it
self.annotate(meth.id, true, &meth.attrs, |_| {}); self.annotate(meth.id, true, &meth.attrs, sp, |_| {});
} }
// Items defined in a function body have no reason to have // Items defined in a function body have no reason to have
// a stability attribute, so we don't recurse. // a stability attribute, so we don't recurse.
} }
fn visit_trait_item(&mut self, t: &TraitItem) { fn visit_trait_item(&mut self, t: &TraitItem) {
let (id, attrs) = match *t { let (id, attrs, sp) = match *t {
RequiredMethod(TypeMethod {id, ref attrs, ..}) => (id, attrs), RequiredMethod(TypeMethod {id, ref attrs, span, ..}) => (id, attrs, span),
// work around lack of pattern matching for @ types // work around lack of pattern matching for @ types
ProvidedMethod(ref method) => { ProvidedMethod(ref method) => {
match **method { match **method {
Method {ref attrs, id, ..} => (id, attrs), Method {ref attrs, id, span, ..} => (id, attrs, span),
} }
} }
TypeTraitItem(ref typedef) => (typedef.ty_param.id, &typedef.attrs), TypeTraitItem(ref typedef) => (typedef.ty_param.id, &typedef.attrs,
typedef.ty_param.span),
}; };
self.annotate(id, true, attrs, |v| visit::walk_trait_item(v, t)); self.annotate(id, true, attrs, sp, |v| visit::walk_trait_item(v, t));
} }
fn visit_variant(&mut self, var: &Variant, g: &'v Generics) { fn visit_variant(&mut self, var: &Variant, g: &'v Generics) {
self.annotate(var.node.id, true, &var.node.attrs, self.annotate(var.node.id, true, &var.node.attrs, var.span,
|v| visit::walk_variant(v, var, g)) |v| visit::walk_variant(v, var, g))
} }
fn visit_struct_field(&mut self, s: &StructField) { fn visit_struct_field(&mut self, s: &StructField) {
self.annotate(s.node.id, true, &s.node.attrs, self.annotate(s.node.id, true, &s.node.attrs, s.span,
|v| visit::walk_struct_field(v, s)); |v| visit::walk_struct_field(v, s));
} }
fn visit_foreign_item(&mut self, i: &ast::ForeignItem) { fn visit_foreign_item(&mut self, i: &ast::ForeignItem) {
self.annotate(i.id, true, &i.attrs, |_| {}); self.annotate(i.id, true, &i.attrs, i.span, |_| {});
} }
} }
@ -171,7 +172,7 @@ impl Index {
index: index, index: index,
parent: None parent: None
}; };
annotator.annotate(ast::CRATE_NODE_ID, true, &krate.attrs, annotator.annotate(ast::CRATE_NODE_ID, true, &krate.attrs, krate.span,
|v| visit::walk_crate(v, krate)); |v| visit::walk_crate(v, krate));
annotator.index annotator.index
} }

1
src/librustc_trans/lib.rs
View file

@ -40,6 +40,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(unicode)] #![feature(unicode)]
#![feature(hash)]
extern crate arena; extern crate arena;
extern crate flate; extern crate flate;

11
src/librustdoc/html/format.rs
View file

@ -765,9 +765,6 @@ impl fmt::String for ModuleSummary {
try!(write!(f, "<span class='summary Unstable' \ try!(write!(f, "<span class='summary Unstable' \
style='width: {:.4}%; display: inline-block'>&nbsp</span>", style='width: {:.4}%; display: inline-block'>&nbsp</span>",
(100 * cnt.unstable) as f64/tot as f64)); (100 * cnt.unstable) as f64/tot as f64));
try!(write!(f, "<span class='summary Deprecated' \
style='width: {:.4}%; display: inline-block'>&nbsp</span>",
(100 * cnt.deprecated) as f64/tot as f64));
try!(write!(f, "<span class='summary Unmarked' \ try!(write!(f, "<span class='summary Unmarked' \
style='width: {:.4}%; display: inline-block'>&nbsp</span>", style='width: {:.4}%; display: inline-block'>&nbsp</span>",
(100 * cnt.unmarked) as f64/tot as f64)); (100 * cnt.unmarked) as f64/tot as f64));
@ -783,12 +780,11 @@ impl fmt::String for ModuleSummary {
let mut context = Vec::new(); let mut context = Vec::new();
let tot = self.counts.total(); let tot = self.counts.total();
let (stable, unstable, deprecated, unmarked) = if tot == 0 { let (stable, unstable, unmarked) = if tot == 0 {
(0, 0, 0, 0) (0, 0, 0)
} else { } else {
((100 * self.counts.stable)/tot, ((100 * self.counts.stable)/tot,
(100 * self.counts.unstable)/tot, (100 * self.counts.unstable)/tot,
(100 * self.counts.deprecated)/tot,
(100 * self.counts.unmarked)/tot) (100 * self.counts.unmarked)/tot)
}; };
@ -800,12 +796,11 @@ its children (percentages total for {name}):
<blockquote> <blockquote>
<a class='stability Stable'></a> stable ({}%),<br/> <a class='stability Stable'></a> stable ({}%),<br/>
<a class='stability Unstable'></a> unstable ({}%),<br/> <a class='stability Unstable'></a> unstable ({}%),<br/>
<a class='stability Deprecated'></a> deprecated ({}%),<br/>
<a class='stability Unmarked'></a> unmarked ({}%) <a class='stability Unmarked'></a> unmarked ({}%)
</blockquote> </blockquote>
The counts do not include methods or trait The counts do not include methods or trait
implementations that are visible only through a re-exported type.", implementations that are visible only through a re-exported type.",
stable, unstable, deprecated, unmarked, stable, unstable, unmarked,
name=self.name)); name=self.name));
try!(write!(f, "<table>")); try!(write!(f, "<table>"));
try!(fmt_inner(f, &mut context, self)); try!(fmt_inner(f, &mut context, self));

8
src/librustdoc/stability_summary.rs
View file

@ -16,7 +16,7 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use std::ops::Add; use std::ops::Add;
use syntax::attr::{Deprecated, Unstable, Stable}; use syntax::attr::{Unstable, Stable};
use syntax::ast::Public; use syntax::ast::Public;
use clean::{Crate, Item, ModuleItem, Module, EnumItem, Enum}; use clean::{Crate, Item, ModuleItem, Module, EnumItem, Enum};
@ -29,7 +29,6 @@ use html::render::cache;
/// The counts for each stability level. /// The counts for each stability level.
#[derive(Copy)] #[derive(Copy)]
pub struct Counts { pub struct Counts {
pub deprecated: uint,
pub unstable: uint, pub unstable: uint,
pub stable: uint, pub stable: uint,
@ -42,7 +41,6 @@ impl Add for Counts {
fn add(self, other: Counts) -> Counts { fn add(self, other: Counts) -> Counts {
Counts { Counts {
deprecated: self.deprecated + other.deprecated,
unstable: self.unstable + other.unstable, unstable: self.unstable + other.unstable,
stable: self.stable + other.stable, stable: self.stable + other.stable,
unmarked: self.unmarked + other.unmarked, unmarked: self.unmarked + other.unmarked,
@ -53,7 +51,6 @@ impl Add for Counts {
impl Counts { impl Counts {
fn zero() -> Counts { fn zero() -> Counts {
Counts { Counts {
deprecated: 0,
unstable: 0, unstable: 0,
stable: 0, stable: 0,
unmarked: 0, unmarked: 0,
@ -61,7 +58,7 @@ impl Counts {
} }
pub fn total(&self) -> uint { pub fn total(&self) -> uint {
self.deprecated + self.unstable + self.stable + self.unmarked self.unstable + self.stable + self.unmarked
} }
} }
@ -98,7 +95,6 @@ fn count_stability(stab: Option<&Stability>) -> Counts {
match stab { match stab {
None => Counts { unmarked: 1, .. Counts::zero() }, None => Counts { unmarked: 1, .. Counts::zero() },
Some(ref stab) => match stab.level { Some(ref stab) => match stab.level {
Deprecated => Counts { deprecated: 1, .. Counts::zero() },
Unstable => Counts { unstable: 1, .. Counts::zero() }, Unstable => Counts { unstable: 1, .. Counts::zero() },
Stable => Counts { stable: 1, .. Counts::zero() }, Stable => Counts { stable: 1, .. Counts::zero() },
} }

1
src/libserialize/lib.rs
View file

@ -37,6 +37,7 @@ Core encoding and decoding interfaces.
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(unicode)] #![feature(unicode)]
#![cfg_attr(test, feature(test))]
// test harness access // test harness access
#[cfg(test)] extern crate test; #[cfg(test)] extern crate test;

3
src/libstd/io/mem.rs
View file

@ -62,7 +62,8 @@ impl Writer for Vec<u8> {
/// ///
/// assert_eq!(w.into_inner(), vec!(0, 1, 2)); /// assert_eq!(w.into_inner(), vec!(0, 1, 2));
/// ``` /// ```
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "io")]
#[deprecated(since = "1.0.0",
reason = "use the Vec<u8> Writer implementation directly")] reason = "use the Vec<u8> Writer implementation directly")]
#[derive(Clone)] #[derive(Clone)]
pub struct MemWriter { pub struct MemWriter {

1
src/libstd/lib.rs
View file

@ -121,6 +121,7 @@
#![feature(collections)] #![feature(collections)]
#![feature(rand)] #![feature(rand)]
#![feature(hash)] #![feature(hash)]
#![cfg_attr(test, feature(test))]
// Don't link to std. We are std. // Don't link to std. We are std.
#![no_std] #![no_std]

3
src/libstd/num/int.rs
View file

@ -14,7 +14,8 @@
//! alpha cycle along with the development of clearer conventions //! alpha cycle along with the development of clearer conventions
//! around integer types. //! around integer types.
#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by isize")] #![unstable(feature = "std_misc")]
#![deprecated(since = "1.0.0", reason = "replaced by isize")]
pub use core::int::{BITS, BYTES, MIN, MAX}; pub use core::int::{BITS, BYTES, MIN, MAX};

21
src/libstd/num/mod.rs
View file

@ -79,32 +79,39 @@ pub trait Float
// FIXME (#5527): These should be associated constants // FIXME (#5527): These should be associated constants
/// Returns the number of binary digits of mantissa that this type supports. /// Returns the number of binary digits of mantissa that this type supports.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MANTISSA_DIGITS` or \ reason = "use `std::f32::MANTISSA_DIGITS` or \
`std::f64::MANTISSA_DIGITS` as appropriate")] `std::f64::MANTISSA_DIGITS` as appropriate")]
fn mantissa_digits(unused_self: Option<Self>) -> uint; fn mantissa_digits(unused_self: Option<Self>) -> uint;
/// Returns the number of base-10 digits of precision that this type supports. /// Returns the number of base-10 digits of precision that this type supports.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")] reason = "use `std::f32::DIGITS` or `std::f64::DIGITS` as appropriate")]
fn digits(unused_self: Option<Self>) -> uint; fn digits(unused_self: Option<Self>) -> uint;
/// Returns the difference between 1.0 and the smallest representable number larger than 1.0. /// Returns the difference between 1.0 and the smallest representable number larger than 1.0.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")] reason = "use `std::f32::EPSILON` or `std::f64::EPSILON` as appropriate")]
fn epsilon() -> Self; fn epsilon() -> Self;
/// Returns the minimum binary exponent that this type can represent. /// Returns the minimum binary exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")] reason = "use `std::f32::MIN_EXP` or `std::f64::MIN_EXP` as appropriate")]
fn min_exp(unused_self: Option<Self>) -> int; fn min_exp(unused_self: Option<Self>) -> int;
/// Returns the maximum binary exponent that this type can represent. /// Returns the maximum binary exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")] reason = "use `std::f32::MAX_EXP` or `std::f64::MAX_EXP` as appropriate")]
fn max_exp(unused_self: Option<Self>) -> int; fn max_exp(unused_self: Option<Self>) -> int;
/// Returns the minimum base-10 exponent that this type can represent. /// Returns the minimum base-10 exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")] reason = "use `std::f32::MIN_10_EXP` or `std::f64::MIN_10_EXP` as appropriate")]
fn min_10_exp(unused_self: Option<Self>) -> int; fn min_10_exp(unused_self: Option<Self>) -> int;
/// Returns the maximum base-10 exponent that this type can represent. /// Returns the maximum base-10 exponent that this type can represent.
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")] reason = "use `std::f32::MAX_10_EXP` or `std::f64::MAX_10_EXP` as appropriate")]
fn max_10_exp(unused_self: Option<Self>) -> int; fn max_10_exp(unused_self: Option<Self>) -> int;

3
src/libstd/num/uint.rs
View file

@ -14,7 +14,8 @@
//! alpha cycle along with the development of clearer conventions //! alpha cycle along with the development of clearer conventions
//! around integer types. //! around integer types.
#![deprecated(feature = "oldstuff", since = "1.0.0", reason = "replaced by usize")] #![unstable(feature = "std_misc")]
#![deprecated(since = "1.0.0", reason = "replaced by usize")]
pub use core::uint::{BITS, BYTES, MIN, MAX}; pub use core::uint::{BITS, BYTES, MIN, MAX};

1
src/libstd/prelude/mod.rs
View file

@ -37,5 +37,4 @@
#![stable(feature = "grandfathered", since = "1.0.0")] #![stable(feature = "grandfathered", since = "1.0.0")]
#[stable(feature = "grandfathered", since = "1.0.0")]
pub mod v1; pub mod v1;

3
src/libstd/sync/poison.rs
View file

@ -105,7 +105,8 @@ impl<T> Error for PoisonError<T> {
impl<T> PoisonError<T> { impl<T> PoisonError<T> {
/// Consumes this error indicating that a lock is poisoned, returning the /// Consumes this error indicating that a lock is poisoned, returning the
/// underlying guard to allow access regardless. /// underlying guard to allow access regardless.
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "renamed to into_inner")] #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0", reason = "renamed to into_inner")]
pub fn into_guard(self) -> T { self.guard } pub fn into_guard(self) -> T { self.guard }
/// Consumes this error indicating that a lock is poisoned, returning the /// Consumes this error indicating that a lock is poisoned, returning the

3
src/libstd/thread_local/mod.rs
View file

@ -319,7 +319,8 @@ impl<T: 'static> Key<T> {
} }
/// Deprecated /// Deprecated
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0",
reason = "function renamed to state() and returns more info")] reason = "function renamed to state() and returns more info")]
pub fn destroyed(&'static self) -> bool { self.state() == State::Destroyed } pub fn destroyed(&'static self) -> bool { self.state() == State::Destroyed }
} }

94
src/libsyntax/attr.rs
View file

@ -351,13 +351,15 @@ pub struct Stability {
pub level: StabilityLevel, pub level: StabilityLevel,
pub feature: InternedString, pub feature: InternedString,
pub since: Option<InternedString>, pub since: Option<InternedString>,
pub deprecated_since: Option<InternedString>,
// The reason for the current stability level. If deprecated, the
// reason for deprecation.
pub reason: Option<InternedString>, pub reason: Option<InternedString>,
} }
/// The available stability levels. /// The available stability levels.
#[derive(RustcEncodable,RustcDecodable,PartialEq,PartialOrd,Clone,Show,Copy)] #[derive(RustcEncodable,RustcDecodable,PartialEq,PartialOrd,Clone,Show,Copy)]
pub enum StabilityLevel { pub enum StabilityLevel {
Deprecated,
Unstable, Unstable,
Stable, Stable,
} }
@ -368,18 +370,24 @@ impl fmt::String for StabilityLevel {
} }
} }
pub fn find_stability_generic<'a, fn find_stability_generic<'a,
AM: AttrMetaMethods, AM: AttrMetaMethods,
I: Iterator<Item=&'a AM>> I: Iterator<Item=&'a AM>>
(diagnostic: &SpanHandler, mut attrs: I) (diagnostic: &SpanHandler, mut attrs: I, item_sp: Span)
-> Option<(Stability, &'a AM)> { -> (Option<Stability>, Vec<&'a AM>) {
for attr in attrs {
let level = match attr.name().get() { let mut stab: Option<Stability> = None;
"deprecated" => Deprecated, let mut deprecated: Option<(InternedString, Option<InternedString>)> = None;
"unstable" => Unstable, let mut used_attrs: Vec<&'a AM> = vec![];
"stable" => Stable,
_ => continue // not a stability level 'outer: for attr in attrs {
}; let tag = attr.name();
let tag = tag.get();
if tag != "deprecated" && tag != "unstable" && tag != "stable" {
continue // not a stability level
}
used_attrs.push(attr);
let (feature, since, reason) = match attr.meta_item_list() { let (feature, since, reason) = match attr.meta_item_list() {
Some(metas) => { Some(metas) => {
@ -392,6 +400,7 @@ pub fn find_stability_generic<'a,
Some(v) => feature = Some(v), Some(v) => feature = Some(v),
None => { None => {
diagnostic.span_err(meta.span, "incorrect meta item"); diagnostic.span_err(meta.span, "incorrect meta item");
continue 'outer;
} }
} }
} }
@ -400,6 +409,7 @@ pub fn find_stability_generic<'a,
Some(v) => since = Some(v), Some(v) => since = Some(v),
None => { None => {
diagnostic.span_err(meta.span, "incorrect meta item"); diagnostic.span_err(meta.span, "incorrect meta item");
continue 'outer;
} }
} }
} }
@ -408,6 +418,7 @@ pub fn find_stability_generic<'a,
Some(v) => reason = Some(v), Some(v) => reason = Some(v),
None => { None => {
diagnostic.span_err(meta.span, "incorrect meta item"); diagnostic.span_err(meta.span, "incorrect meta item");
continue 'outer;
} }
} }
} }
@ -416,34 +427,71 @@ pub fn find_stability_generic<'a,
} }
None => { None => {
diagnostic.span_err(attr.span(), "incorrect stability attribute type"); diagnostic.span_err(attr.span(), "incorrect stability attribute type");
(None, None, None) continue
} }
}; };
if feature == None { // Deprecated tags don't require feature names
if feature == None && tag != "deprecated" {
diagnostic.span_err(attr.span(), "missing 'feature'"); diagnostic.span_err(attr.span(), "missing 'feature'");
} }
if since == None && level != Unstable { // Unstable tags don't require a version
if since == None && tag != "unstable" {
diagnostic.span_err(attr.span(), "missing 'since'"); diagnostic.span_err(attr.span(), "missing 'since'");
} }
return Some((Stability { if tag == "unstable" || tag == "stable" {
if stab.is_some() {
diagnostic.span_err(item_sp, "multiple stability levels");
}
let level = match tag {
"unstable" => Unstable,
"stable" => Stable,
_ => unreachable!()
};
stab = Some(Stability {
level: level, level: level,
feature: feature.unwrap_or(intern_and_get_ident("bogus")), feature: feature.unwrap_or(intern_and_get_ident("bogus")),
since: since, since: since,
reason: reason, deprecated_since: None,
}, attr)); reason: reason
});
} else { // "deprecated"
if deprecated.is_some() {
diagnostic.span_err(item_sp, "multiple deprecated attributes");
} }
None
deprecated = Some((since.unwrap_or(intern_and_get_ident("bogus")), reason));
}
}
// Merge the deprecation info into the stability info
if deprecated.is_some() {
match stab {
Some(ref mut s) => {
let (since, reason) = deprecated.unwrap();
s.deprecated_since = Some(since);
s.reason = reason;
}
None => {
diagnostic.span_err(item_sp, "deprecated attribute must be paired with \
either stable or unstable attribute");
}
}
}
(stab, used_attrs)
} }
/// Find the first stability attribute. `None` if none exists. /// Find the first stability attribute. `None` if none exists.
pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute]) -> Option<Stability> { pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute],
find_stability_generic(diagnostic, attrs.iter()).map(|(s, attr)| { item_sp: Span) -> Option<Stability> {
mark_used(attr); let (s, used) = find_stability_generic(diagnostic, attrs.iter(), item_sp);
s for used in used.into_iter() { mark_used(used) }
}) return s;
} }
pub fn require_unique_names(diagnostic: &SpanHandler, metas: &[P<MetaItem>]) { pub fn require_unique_names(diagnostic: &SpanHandler, metas: &[P<MetaItem>]) {

3
src/libsyntax/ext/base.rs
View file

@ -568,7 +568,8 @@ impl<'a> ExtCtxt<'a> {
} }
} }
#[deprecated(feature = "oldstuff", since = "1.0.0", #[unstable(feature = "rustc_private")]
#[deprecated(since = "1.0.0",
reason = "Replaced with `expander().fold_expr()`")] reason = "Replaced with `expander().fold_expr()`")]
pub fn expand_expr(&mut self, e: P<ast::Expr>) -> P<ast::Expr> { pub fn expand_expr(&mut self, e: P<ast::Expr>) -> P<ast::Expr> {
self.expander().fold_expr(e) self.expander().fold_expr(e)

3
src/libsyntax/util/small_vector.rs
View file

@ -112,7 +112,8 @@ impl<T> SmallVector<T> {
} }
/// Deprecated: use `into_iter`. /// Deprecated: use `into_iter`.
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "use into_iter")] #[unstable(feature = "rustc_private")]
#[deprecated(since = "1.0.0", reason = "use into_iter")]
pub fn move_iter(self) -> IntoIter<T> { pub fn move_iter(self) -> IntoIter<T> {
self.into_iter() self.into_iter()
} }

3
src/test/auxiliary/inherited_stability.rs
View file

@ -28,7 +28,8 @@ pub mod stable_mod {
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub mod unstable_mod { pub mod unstable_mod {
#[deprecated(feature = "test_feature", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub fn deprecated() {} pub fn deprecated() {}
pub fn unstable() {} pub fn unstable() {}

3
src/test/auxiliary/lint_output_format.rs
View file

@ -14,7 +14,8 @@
#![staged_api] #![staged_api]
#![unstable(feature = "test_feature")] #![unstable(feature = "test_feature")]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub fn foo() -> uint { pub fn foo() -> uint {
20 20
} }

63
src/test/auxiliary/lint_stability.rs
View file

@ -12,11 +12,20 @@
#![feature(staged_api)] #![feature(staged_api)]
#![staged_api] #![staged_api]
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub fn deprecated() {} pub fn deprecated() {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn deprecated_text() {} pub fn deprecated_text() {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub fn deprecated_unstable() {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn deprecated_unstable_text() {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub fn unstable() {} pub fn unstable() {}
#[unstable(feature = "test_feature", reason = "text")] #[unstable(feature = "test_feature", reason = "text")]
@ -33,11 +42,20 @@ pub fn stable_text() {}
pub struct MethodTester; pub struct MethodTester;
impl MethodTester { impl MethodTester {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub fn method_deprecated(&self) {} pub fn method_deprecated(&self) {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn method_deprecated_text(&self) {} pub fn method_deprecated_text(&self) {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub fn method_deprecated_unstable(&self) {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn method_deprecated_unstable_text(&self) {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub fn method_unstable(&self) {} pub fn method_unstable(&self) {}
#[unstable(feature = "test_feature", reason = "text")] #[unstable(feature = "test_feature", reason = "text")]
@ -62,11 +80,20 @@ impl MethodTester {
} }
pub trait Trait { pub trait Trait {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
fn trait_deprecated(&self) {} fn trait_deprecated(&self) {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "text")]
fn trait_deprecated_text(&self) {} fn trait_deprecated_text(&self) {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
fn trait_deprecated_unstable(&self) {}
#[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
fn trait_deprecated_unstable_text(&self) {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
fn trait_unstable(&self) {} fn trait_unstable(&self) {}
#[unstable(feature = "test_feature", reason = "text")] #[unstable(feature = "test_feature", reason = "text")]
@ -95,26 +122,38 @@ impl Trait for MethodTester {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub trait UnstableTrait {} pub trait UnstableTrait {}
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedStruct { pub i: int } pub struct DeprecatedStruct { pub i: int }
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedUnstableStruct { pub i: int }
#[unstable(feature = "test_feature")]
pub struct UnstableStruct { pub i: int } pub struct UnstableStruct { pub i: int }
pub struct UnmarkedStruct { pub i: int } pub struct UnmarkedStruct { pub i: int }
#[stable(feature = "grandfathered", since = "1.0.0")] #[stable(feature = "grandfathered", since = "1.0.0")]
pub struct StableStruct { pub i: int } pub struct StableStruct { pub i: int }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedUnitStruct; pub struct DeprecatedUnitStruct;
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedUnstableUnitStruct;
#[unstable(feature = "test_feature")]
pub struct UnstableUnitStruct; pub struct UnstableUnitStruct;
pub struct UnmarkedUnitStruct; pub struct UnmarkedUnitStruct;
#[stable(feature = "grandfathered", since = "1.0.0")] #[stable(feature = "grandfathered", since = "1.0.0")]
pub struct StableUnitStruct; pub struct StableUnitStruct;
pub enum Enum { pub enum Enum {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
DeprecatedVariant, DeprecatedVariant,
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
DeprecatedUnstableVariant,
#[unstable(feature = "test_feature")]
UnstableVariant, UnstableVariant,
UnmarkedVariant, UnmarkedVariant,
@ -122,9 +161,13 @@ pub enum Enum {
StableVariant, StableVariant,
} }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[stable(feature = "test_feature", since = "1.0.0")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedTupleStruct(pub int); pub struct DeprecatedTupleStruct(pub int);
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedUnstableTupleStruct(pub int);
#[unstable(feature = "test_feature")]
pub struct UnstableTupleStruct(pub int); pub struct UnstableTupleStruct(pub int);
pub struct UnmarkedTupleStruct(pub int); pub struct UnmarkedTupleStruct(pub int);
#[stable(feature = "grandfathered", since = "1.0.0")] #[stable(feature = "grandfathered", since = "1.0.0")]

3
src/test/compile-fail/issue-17337.rs
View file

@ -15,7 +15,8 @@
struct Foo; struct Foo;
impl Foo { impl Foo {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
fn foo(self) {} fn foo(self) {}
} }

71
src/test/compile-fail/lint-stability.rs
View file

@ -39,6 +39,20 @@ mod cross_crate {
foo.method_deprecated_text(); //~ ERROR use of deprecated item: text foo.method_deprecated_text(); //~ ERROR use of deprecated item: text
foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text
deprecated_unstable(); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
foo.method_deprecated_unstable(); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
foo.trait_deprecated_unstable(); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
deprecated_unstable_text(); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
foo.method_deprecated_unstable_text(); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
foo.trait_deprecated_unstable_text(); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
unstable(); //~ WARNING use of unstable library feature unstable(); //~ WARNING use of unstable library feature
foo.method_unstable(); //~ WARNING use of unstable library feature foo.method_unstable(); //~ WARNING use of unstable library feature
foo.trait_unstable(); //~ WARNING use of unstable library feature foo.trait_unstable(); //~ WARNING use of unstable library feature
@ -60,21 +74,29 @@ mod cross_crate {
foo.trait_stable_text(); foo.trait_stable_text();
let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
let _ = DeprecatedUnstableStruct { i: 0 }; //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
let _ = UnstableStruct { i: 0 }; //~ WARNING use of unstable library feature let _ = UnstableStruct { i: 0 }; //~ WARNING use of unstable library feature
let _ = UnmarkedStruct { i: 0 }; //~ ERROR use of unmarked library feature let _ = UnmarkedStruct { i: 0 }; //~ ERROR use of unmarked library feature
let _ = StableStruct { i: 0 }; let _ = StableStruct { i: 0 };
let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item
let _ = DeprecatedUnstableUnitStruct; //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
let _ = UnstableUnitStruct; //~ WARNING use of unstable library feature let _ = UnstableUnitStruct; //~ WARNING use of unstable library feature
let _ = UnmarkedUnitStruct; //~ ERROR use of unmarked library feature let _ = UnmarkedUnitStruct; //~ ERROR use of unmarked library feature
let _ = StableUnitStruct; let _ = StableUnitStruct;
let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item
let _ = Enum::DeprecatedUnstableVariant; //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
let _ = Enum::UnstableVariant; //~ WARNING use of unstable library feature let _ = Enum::UnstableVariant; //~ WARNING use of unstable library feature
let _ = Enum::UnmarkedVariant; //~ ERROR use of unmarked library feature let _ = Enum::UnmarkedVariant; //~ ERROR use of unmarked library feature
let _ = Enum::StableVariant; let _ = Enum::StableVariant;
let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item
let _ = DeprecatedUnstableTupleStruct (1); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
let _ = UnstableTupleStruct (1); //~ WARNING use of unstable library feature let _ = UnstableTupleStruct (1); //~ WARNING use of unstable library feature
let _ = UnmarkedTupleStruct (1); //~ ERROR use of unmarked library feature let _ = UnmarkedTupleStruct (1); //~ ERROR use of unmarked library feature
let _ = StableTupleStruct (1); let _ = StableTupleStruct (1);
@ -86,6 +108,8 @@ mod cross_crate {
// on macros themselves are not yet linted. // on macros themselves are not yet linted.
macro_test!(); macro_test!();
macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated item: text macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated item: text
macro_test_arg!(deprecated_unstable_text()); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated item: text macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated item: text
macro_test_arg_nested!(deprecated_text); macro_test_arg_nested!(deprecated_text);
} }
@ -93,6 +117,10 @@ mod cross_crate {
fn test_method_param<F: Trait>(foo: F) { fn test_method_param<F: Trait>(foo: F) {
foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated(); //~ ERROR use of deprecated item
foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text
foo.trait_deprecated_unstable(); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
foo.trait_deprecated_unstable_text(); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
foo.trait_unstable(); //~ WARNING use of unstable library feature foo.trait_unstable(); //~ WARNING use of unstable library feature
foo.trait_unstable_text(); //~ WARNING use of unstable library feature 'test_feature': text foo.trait_unstable_text(); //~ WARNING use of unstable library feature 'test_feature': text
foo.trait_unmarked(); //~ ERROR use of unmarked library feature foo.trait_unmarked(); //~ ERROR use of unmarked library feature
@ -102,6 +130,10 @@ mod cross_crate {
fn test_method_object(foo: &Trait) { fn test_method_object(foo: &Trait) {
foo.trait_deprecated(); //~ ERROR use of deprecated item foo.trait_deprecated(); //~ ERROR use of deprecated item
foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text foo.trait_deprecated_text(); //~ ERROR use of deprecated item: text
foo.trait_deprecated_unstable(); //~ ERROR use of deprecated item
//~^ WARNING use of unstable library feature
foo.trait_deprecated_unstable_text(); //~ ERROR use of deprecated item: text
//~^ WARNING use of unstable library feature
foo.trait_unstable(); //~ WARNING use of unstable library feature foo.trait_unstable(); //~ WARNING use of unstable library feature
foo.trait_unstable_text(); //~ WARNING use of unstable library feature 'test_feature': text foo.trait_unstable_text(); //~ WARNING use of unstable library feature 'test_feature': text
foo.trait_unmarked(); //~ ERROR use of unmarked library feature foo.trait_unmarked(); //~ ERROR use of unmarked library feature
@ -139,9 +171,11 @@ mod inheritance {
} }
mod this_crate { mod this_crate {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub fn deprecated() {} pub fn deprecated() {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn deprecated_text() {} pub fn deprecated_text() {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
@ -160,9 +194,11 @@ mod this_crate {
pub struct MethodTester; pub struct MethodTester;
impl MethodTester { impl MethodTester {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub fn method_deprecated(&self) {} pub fn method_deprecated(&self) {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
pub fn method_deprecated_text(&self) {} pub fn method_deprecated_text(&self) {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
@ -179,9 +215,11 @@ mod this_crate {
} }
pub trait Trait { pub trait Trait {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
fn trait_deprecated(&self) {} fn trait_deprecated(&self) {}
#[deprecated(feature = "oldstuff", since = "1.0.0", reason = "text")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0", reason = "text")]
fn trait_deprecated_text(&self) {} fn trait_deprecated_text(&self) {}
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
@ -199,7 +237,8 @@ mod this_crate {
impl Trait for MethodTester {} impl Trait for MethodTester {}
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedStruct { i: isize } pub struct DeprecatedStruct { i: isize }
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub struct UnstableStruct { i: isize } pub struct UnstableStruct { i: isize }
@ -207,7 +246,8 @@ mod this_crate {
#[stable(feature = "grandfathered", since = "1.0.0")] #[stable(feature = "grandfathered", since = "1.0.0")]
pub struct StableStruct { i: isize } pub struct StableStruct { i: isize }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedUnitStruct; pub struct DeprecatedUnitStruct;
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub struct UnstableUnitStruct; pub struct UnstableUnitStruct;
@ -216,7 +256,8 @@ mod this_crate {
pub struct StableUnitStruct; pub struct StableUnitStruct;
pub enum Enum { pub enum Enum {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
DeprecatedVariant, DeprecatedVariant,
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
UnstableVariant, UnstableVariant,
@ -226,7 +267,8 @@ mod this_crate {
StableVariant, StableVariant,
} }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub struct DeprecatedTupleStruct(isize); pub struct DeprecatedTupleStruct(isize);
#[unstable(feature = "test_feature")] #[unstable(feature = "test_feature")]
pub struct UnstableTupleStruct(isize); pub struct UnstableTupleStruct(isize);
@ -308,21 +350,24 @@ mod this_crate {
foo.trait_stable(); foo.trait_stable();
} }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
fn test_fn_body() { fn test_fn_body() {
fn fn_in_body() {} fn fn_in_body() {}
fn_in_body(); fn_in_body();
} }
impl MethodTester { impl MethodTester {
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
fn test_method_body(&self) { fn test_method_body(&self) {
fn fn_in_body() {} fn fn_in_body() {}
fn_in_body(); fn_in_body();
} }
} }
#[deprecated(feature = "oldstuff", since = "1.0.0")] #[unstable(feature = "test_feature")]
#[deprecated(since = "1.0.0")]
pub trait DeprecatedTrait {} pub trait DeprecatedTrait {}
struct S; struct S;

95
src/test/compile-fail/stability-attribute-sanity.rs Normal file
View file

@ -0,0 +1,95 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Various checks that stability attributes are used correctly, per RFC 507
#![feature(staged_api)]
#![staged_api]
mod bogus_attribute_types_1 {
#[stable(feature = "a", since = "a", reason)] //~ ERROR incorrect meta item
fn f1() { }
#[stable(feature = "a", since, reason = "a")] //~ ERROR incorrect meta item
fn f2() { }
#[stable(feature, since = "a", reason = "a")] //~ ERROR incorrect meta item
fn f3() { }
#[stable(feature = "a", since = "a", reason(b))] //~ ERROR incorrect meta item
fn f4() { }
#[stable(feature = "a", since(b), reason = "a")] //~ ERROR incorrect meta item
fn f5() { }
#[stable(feature(b), since = "a", reason = "a")] //~ ERROR incorrect meta item
fn f6() { }
}
mod bogus_attribute_types_2 {
#[unstable] //~ ERROR incorrect stability attribute type
fn f1() { }
#[unstable = "a"] //~ ERROR incorrect stability attribute type
fn f2() { }
#[stable] //~ ERROR incorrect stability attribute type
fn f3() { }
#[stable = "a"] //~ ERROR incorrect stability attribute type
fn f4() { }
#[stable(feature = "a", since = "b")]
#[deprecated] //~ ERROR incorrect stability attribute type
fn f5() { }
#[stable(feature = "a", since = "b")]
#[deprecated = "a"] //~ ERROR incorrect stability attribute type
fn f6() { }
}
mod missing_feature_names {
#[unstable(since = "a")] //~ ERROR missing 'feature'
fn f1() { }
#[stable(since = "a")] //~ ERROR missing 'feature'
fn f2() { }
}
mod missing_version {
#[stable(feature = "a")] //~ ERROR missing 'since'
fn f1() { }
#[stable(feature = "a", since = "b")]
#[deprecated(reason = "a")] //~ ERROR missing 'since'
fn f2() { }
}
#[unstable(feature = "a", since = "b")]
#[stable(feature = "a", since = "b")]
fn multiple1() { } //~ ERROR multiple stability levels
#[unstable(feature = "a", since = "b")]
#[unstable(feature = "a", since = "b")]
fn multiple2() { } //~ ERROR multiple stability levels
#[stable(feature = "a", since = "b")]
#[stable(feature = "a", since = "b")]
fn multiple3() { } //~ ERROR multiple stability levels
#[stable(feature = "a", since = "b")]
#[deprecated(since = "b")]
#[deprecated(since = "b")]
fn multiple4() { } //~ ERROR multiple deprecated attributes
#[deprecated(since = "a")]
fn deprecated_without_unstable_or_stable() { } //~ ERROR deprecated attribute must be paired
fn main() { }