diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py
index 2e7958325cd61..440181a7611cb 100644
--- a/src/etc/htmldocck.py
+++ b/src/etc/htmldocck.py
@@ -125,8 +125,8 @@
from htmlentitydefs import name2codepoint
# "void elements" (no closing tag) from the HTML Standard section 12.1.2
-VOID_ELEMENTS = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
- 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'])
+VOID_ELEMENTS = {'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
+ 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'}
# Python 2 -> 3 compatibility
try:
@@ -146,7 +146,7 @@ def __init__(self, target=None):
self.__builder = target or ET.TreeBuilder()
def handle_starttag(self, tag, attrs):
- attrs = dict((k, v or '') for k, v in attrs)
+ attrs = {k: v or '' for k, v in attrs}
self.__builder.start(tag, attrs)
if tag in VOID_ELEMENTS:
self.__builder.end(tag)
@@ -155,7 +155,7 @@ def handle_endtag(self, tag):
self.__builder.end(tag)
def handle_startendtag(self, tag, attrs):
- attrs = dict((k, v or '') for k, v in attrs)
+ attrs = {k: v or '' for k, v in attrs}
self.__builder.start(tag, attrs)
self.__builder.end(tag)
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index e2dc816b01526..fa20a46671591 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -6,6 +6,7 @@
#![feature(map_first_last)]
#![feature(new_uninit)]
#![feature(pattern)]
+#![feature(str_split_once)]
#![feature(trusted_len)]
#![feature(try_reserve)]
#![feature(unboxed_closures)]
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index eee98d4534042..b20cf076aca3c 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1318,6 +1318,30 @@ fn test_rsplitn() {
assert_eq!(split, ["mb\n", "\nMäry häd ä little lämb\nLittle l"]);
}
+#[test]
+fn test_split_once() {
+ assert_eq!("".split_once("->"), None);
+ assert_eq!("-".split_once("->"), None);
+ assert_eq!("->".split_once("->"), Some(("", "")));
+ assert_eq!("a->".split_once("->"), Some(("a", "")));
+ assert_eq!("->b".split_once("->"), Some(("", "b")));
+ assert_eq!("a->b".split_once("->"), Some(("a", "b")));
+ assert_eq!("a->b->c".split_once("->"), Some(("a", "b->c")));
+ assert_eq!("---".split_once("--"), Some(("", "-")));
+}
+
+#[test]
+fn test_rsplit_once() {
+ assert_eq!("".rsplit_once("->"), None);
+ assert_eq!("-".rsplit_once("->"), None);
+ assert_eq!("->".rsplit_once("->"), Some(("", "")));
+ assert_eq!("a->".rsplit_once("->"), Some(("a", "")));
+ assert_eq!("->b".rsplit_once("->"), Some(("", "b")));
+ assert_eq!("a->b".rsplit_once("->"), Some(("a", "b")));
+ assert_eq!("a->b->c".rsplit_once("->"), Some(("a->b", "c")));
+ assert_eq!("---".rsplit_once("--"), Some(("-", "")));
+}
+
#[test]
fn test_split_whitespace() {
let data = "\n \tMäry häd\tä little lämb\nLittle lämb\n";
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 790ec4bd24f8d..9d7e38d0e1831 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -3610,6 +3610,47 @@ impl str {
RSplitN(self.splitn(n, pat).0)
}
+ /// Splits the string on the first occurrence of the specified delimiter and
+ /// returns prefix before delimiter and suffix after delimiter.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(str_split_once)]
+ ///
+ /// assert_eq!("cfg".split_once('='), None);
+ /// assert_eq!("cfg=foo".split_once('='), Some(("cfg", "foo")));
+ /// assert_eq!("cfg=foo=bar".split_once('='), Some(("cfg", "foo=bar")));
+ /// ```
+ #[unstable(feature = "str_split_once", reason = "newly added", issue = "74773")]
+ #[inline]
+ pub fn split_once<'a, P: Pattern<'a>>(&'a self, delimiter: P) -> Option<(&'a str, &'a str)> {
+ let (start, end) = delimiter.into_searcher(self).next_match()?;
+ Some((&self[..start], &self[end..]))
+ }
+
+ /// Splits the string on the last occurrence of the specified delimiter and
+ /// returns prefix before delimiter and suffix after delimiter.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(str_split_once)]
+ ///
+ /// assert_eq!("cfg".rsplit_once('='), None);
+ /// assert_eq!("cfg=foo".rsplit_once('='), Some(("cfg", "foo")));
+ /// assert_eq!("cfg=foo=bar".rsplit_once('='), Some(("cfg=foo", "bar")));
+ /// ```
+ #[unstable(feature = "str_split_once", reason = "newly added", issue = "74773")]
+ #[inline]
+ pub fn rsplit_once<'a, P>(&'a self, delimiter: P) -> Option<(&'a str, &'a str)>
+ where
+ P: Pattern<'a, Searcher: ReverseSearcher<'a>>,
+ {
+ let (start, end) = delimiter.into_searcher(self).next_match_back()?;
+ Some((&self[..start], &self[end..]))
+ }
+
/// An iterator over the disjoint matches of a pattern within the given string
/// slice.
///
diff --git a/src/librustc_lint/context.rs b/src/librustc_lint/context.rs
index 84f5ea7bcda85..31d30a264a59e 100644
--- a/src/librustc_lint/context.rs
+++ b/src/librustc_lint/context.rs
@@ -573,7 +573,7 @@ pub trait LintContext: Sized {
}
}
BuiltinLintDiagnostics::DeprecatedMacro(suggestion, span) => {
- stability::deprecation_suggestion(&mut db, suggestion, span)
+ stability::deprecation_suggestion(&mut db, "macro", suggestion, span)
}
BuiltinLintDiagnostics::UnusedDocComment(span) => {
db.span_label(span, "rustdoc does not generate documentation for macro invocations");
diff --git a/src/librustc_middle/middle/stability.rs b/src/librustc_middle/middle/stability.rs
index 5f7ff54fd31c3..b913d7dd4ad0b 100644
--- a/src/librustc_middle/middle/stability.rs
+++ b/src/librustc_middle/middle/stability.rs
@@ -166,29 +166,31 @@ pub fn deprecation_in_effect(is_since_rustc_version: bool, since: Option<&str>)
pub fn deprecation_suggestion(
diag: &mut DiagnosticBuilder<'_>,
+ kind: &str,
suggestion: Option,
span: Span,
) {
if let Some(suggestion) = suggestion {
diag.span_suggestion(
span,
- "replace the use of the deprecated item",
+ &format!("replace the use of the deprecated {}", kind),
suggestion.to_string(),
Applicability::MachineApplicable,
);
}
}
-pub fn deprecation_message(depr: &Deprecation, path: &str) -> (String, &'static Lint) {
+pub fn deprecation_message(depr: &Deprecation, kind: &str, path: &str) -> (String, &'static Lint) {
let (message, lint) = if deprecation_in_effect(
depr.is_since_rustc_version,
depr.since.map(Symbol::as_str).as_deref(),
) {
- (format!("use of deprecated item '{}'", path), DEPRECATED)
+ (format!("use of deprecated {} `{}`", kind, path), DEPRECATED)
} else {
(
format!(
- "use of item '{}' that will be deprecated in future version {}",
+ "use of {} `{}` that will be deprecated in future version {}",
+ kind,
path,
depr.since.unwrap()
),
@@ -224,6 +226,7 @@ fn late_report_deprecation(
lint: &'static Lint,
span: Span,
hir_id: HirId,
+ def_id: DefId,
) {
if span.in_derive_expansion() {
return;
@@ -232,7 +235,8 @@ fn late_report_deprecation(
tcx.struct_span_lint_hir(lint, hir_id, span, |lint| {
let mut diag = lint.build(message);
if let hir::Node::Expr(_) = tcx.hir().get(hir_id) {
- deprecation_suggestion(&mut diag, suggestion, span);
+ let kind = tcx.def_kind(def_id).descr(def_id);
+ deprecation_suggestion(&mut diag, kind, suggestion, span);
}
diag.emit()
});
@@ -304,8 +308,9 @@ impl<'tcx> TyCtxt<'tcx> {
// #[rustc_deprecated] however wants to emit down the whole
// hierarchy.
if !skip || depr_entry.attr.is_since_rustc_version {
- let (message, lint) =
- deprecation_message(&depr_entry.attr, &self.def_path_str(def_id));
+ let path = &self.def_path_str(def_id);
+ let kind = self.def_kind(def_id).descr(def_id);
+ let (message, lint) = deprecation_message(&depr_entry.attr, kind, path);
late_report_deprecation(
self,
&message,
@@ -313,6 +318,7 @@ impl<'tcx> TyCtxt<'tcx> {
lint,
span,
id,
+ def_id,
);
}
};
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index fee7cb4836e3d..ccc7e16ae4cf6 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -1020,7 +1020,7 @@ impl<'a> Resolver<'a> {
}
if let Some(depr) = &ext.deprecation {
let path = pprust::path_to_string(&path);
- let (message, lint) = stability::deprecation_message(depr, &path);
+ let (message, lint) = stability::deprecation_message(depr, "macro", &path);
stability::early_report_deprecation(
&mut self.lint_buffer,
&message,
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index e6d59d30e2f58..21b5f5c9033e6 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1483,36 +1483,25 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
tcx.collect_referenced_late_bound_regions(&ty::Binder::bind(ty));
debug!("late_bound_in_trait_ref = {:?}", late_bound_in_trait_ref);
debug!("late_bound_in_ty = {:?}", late_bound_in_ty);
- for br in late_bound_in_ty.difference(&late_bound_in_trait_ref) {
- let br_name = match *br {
- ty::BrNamed(_, name) => format!("lifetime `{}`", name),
- _ => "an anonymous lifetime".to_string(),
- };
- // FIXME: point at the type params that don't have appropriate lifetimes:
- // struct S1 Fn(&i32, &i32) -> &'a i32>(F);
- // ---- ---- ^^^^^^^
- let mut err = struct_span_err!(
- tcx.sess,
- binding.span,
- E0582,
- "binding for associated type `{}` references {}, \
- which does not appear in the trait input types",
- binding.item_name,
- br_name
- );
-
- if let ty::BrAnon(_) = *br {
- // The only way for an anonymous lifetime to wind up
- // in the return type but **also** be unconstrained is
- // if it only appears in "associated types" in the
- // input. See #62200 for an example. In this case,
- // though we can easily give a hint that ought to be
- // relevant.
- err.note("lifetimes appearing in an associated type are not considered constrained");
- }
- err.emit();
- }
+ // FIXME: point at the type params that don't have appropriate lifetimes:
+ // struct S1 Fn(&i32, &i32) -> &'a i32>(F);
+ // ---- ---- ^^^^^^^
+ self.validate_late_bound_regions(
+ late_bound_in_trait_ref,
+ late_bound_in_ty,
+ |br_name| {
+ struct_span_err!(
+ tcx.sess,
+ binding.span,
+ E0582,
+ "binding for associated type `{}` references {}, \
+ which does not appear in the trait input types",
+ binding.item_name,
+ br_name
+ )
+ },
+ );
}
}
@@ -3085,33 +3074,48 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
tcx.collect_constrained_late_bound_regions(&inputs.map_bound(|i| i.to_owned()));
let output = bare_fn_ty.output();
let late_bound_in_ret = tcx.collect_referenced_late_bound_regions(&output);
- for br in late_bound_in_ret.difference(&late_bound_in_args) {
- let lifetime_name = match *br {
- ty::BrNamed(_, name) => format!("lifetime `{}`,", name),
- ty::BrAnon(_) | ty::BrEnv => "an anonymous lifetime".to_string(),
- };
- let mut err = struct_span_err!(
+
+ self.validate_late_bound_regions(late_bound_in_args, late_bound_in_ret, |br_name| {
+ struct_span_err!(
tcx.sess,
decl.output.span(),
E0581,
- "return type references {} which is not constrained by the fn input types",
- lifetime_name
- );
+ "return type references {}, which is not constrained by the fn input types",
+ br_name
+ )
+ });
+
+ bare_fn_ty
+ }
+
+ fn validate_late_bound_regions(
+ &self,
+ constrained_regions: FxHashSet,
+ referenced_regions: FxHashSet,
+ generate_err: impl Fn(&str) -> rustc_errors::DiagnosticBuilder<'tcx>,
+ ) {
+ for br in referenced_regions.difference(&constrained_regions) {
+ let br_name = match *br {
+ ty::BrNamed(_, name) => format!("lifetime `{}`", name),
+ ty::BrAnon(_) | ty::BrEnv => "an anonymous lifetime".to_string(),
+ };
+
+ let mut err = generate_err(&br_name);
+
if let ty::BrAnon(_) = *br {
// The only way for an anonymous lifetime to wind up
// in the return type but **also** be unconstrained is
// if it only appears in "associated types" in the
- // input. See #47511 for an example. In this case,
+ // input. See #47511 and #62200 for examples. In this case,
// though we can easily give a hint that ought to be
// relevant.
err.note(
"lifetimes appearing in an associated type are not considered constrained",
);
}
+
err.emit();
}
-
- bare_fn_ty
}
/// Given the bounds on an object, determines what single region bound (if any) we can
diff --git a/src/librustdoc/html/static/themes/ayu.css b/src/librustdoc/html/static/themes/ayu.css
index 41fe8e0fafb41..01b7ae8778671 100644
--- a/src/librustdoc/html/static/themes/ayu.css
+++ b/src/librustdoc/html/static/themes/ayu.css
@@ -199,7 +199,6 @@ pre {
pre.rust .comment, pre.rust .doccomment {
color: #788797;
- font-style: italic;
}
nav:not(.sidebar) {
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 797318d95b777..9eb54c2cc0044 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -251,7 +251,6 @@
use crate::cmp;
use crate::fmt;
-use crate::mem;
use crate::memchr;
use crate::ops::{Deref, DerefMut};
use crate::ptr;
@@ -1435,12 +1434,15 @@ pub trait Write {
/// ```
#[unstable(feature = "write_all_vectored", issue = "70436")]
fn write_all_vectored(&mut self, mut bufs: &mut [IoSlice<'_>]) -> Result<()> {
+ // Guarantee that bufs is empty if it contains no data,
+ // to avoid calling write_vectored if there is no data to be written.
+ bufs = IoSlice::advance(bufs, 0);
while !bufs.is_empty() {
match self.write_vectored(bufs) {
Ok(0) => {
return Err(Error::new(ErrorKind::WriteZero, "failed to write whole buffer"));
}
- Ok(n) => bufs = IoSlice::advance(mem::take(&mut bufs), n),
+ Ok(n) => bufs = IoSlice::advance(bufs, n),
Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
Err(e) => return Err(e),
}
@@ -2958,6 +2960,7 @@ mod tests {
#[rustfmt::skip] // Becomes unreadable otherwise.
let tests: Vec<(_, &'static [u8])> = vec![
(vec![], &[]),
+ (vec![IoSlice::new(&[]), IoSlice::new(&[])], &[]),
(vec![IoSlice::new(&[1])], &[1]),
(vec![IoSlice::new(&[1, 2])], &[1, 2]),
(vec![IoSlice::new(&[1, 2, 3])], &[1, 2, 3]),
diff --git a/src/test/ui/binding/func-arg-ref-pattern.rs b/src/test/ui/binding/func-arg-ref-pattern.rs
index ebb7a6afa9b74..f46eeb7a020d8 100644
--- a/src/test/ui/binding/func-arg-ref-pattern.rs
+++ b/src/test/ui/binding/func-arg-ref-pattern.rs
@@ -1,5 +1,4 @@
// run-pass
-// exec-env:RUST_POISON_ON_FREE=1
// Test argument patterns where we create refs to the inside of
// boxes. Make sure that we don't free the box as we match the
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs b/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
index cd635c6a72202..876d8b079a16c 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
@@ -9,13 +9,13 @@
#[cfg_attr(all(), deprecated, must_use)]
struct MustUseDeprecated {}
-impl MustUseDeprecated { //~ warning: use of deprecated item
- fn new() -> MustUseDeprecated { //~ warning: use of deprecated item
- MustUseDeprecated {} //~ warning: use of deprecated item
+impl MustUseDeprecated { //~ warning: use of deprecated
+ fn new() -> MustUseDeprecated { //~ warning: use of deprecated
+ MustUseDeprecated {} //~ warning: use of deprecated
}
}
fn main() {
- MustUseDeprecated::new(); //~ warning: use of deprecated item
+ MustUseDeprecated::new(); //~ warning: use of deprecated
//~| warning: unused `MustUseDeprecated` that must be used
}
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
index d7b5d2d263a10..21b3a6f1f33b6 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'MustUseDeprecated'
+warning: use of deprecated struct `MustUseDeprecated`
--> $DIR/cfg-attr-multi-true.rs:12:6
|
LL | impl MustUseDeprecated {
@@ -6,19 +6,19 @@ LL | impl MustUseDeprecated {
|
= note: `#[warn(deprecated)]` on by default
-warning: use of deprecated item 'MustUseDeprecated'
+warning: use of deprecated struct `MustUseDeprecated`
--> $DIR/cfg-attr-multi-true.rs:19:5
|
LL | MustUseDeprecated::new();
| ^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'MustUseDeprecated'
+warning: use of deprecated struct `MustUseDeprecated`
--> $DIR/cfg-attr-multi-true.rs:13:17
|
LL | fn new() -> MustUseDeprecated {
| ^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'MustUseDeprecated'
+warning: use of deprecated struct `MustUseDeprecated`
--> $DIR/cfg-attr-multi-true.rs:14:9
|
LL | MustUseDeprecated {}
diff --git a/src/test/ui/deprecation/atomic_initializers.fixed b/src/test/ui/deprecation/atomic_initializers.fixed
index d8485ed7da169..4fb0aeeb573e0 100644
--- a/src/test/ui/deprecation/atomic_initializers.fixed
+++ b/src/test/ui/deprecation/atomic_initializers.fixed
@@ -6,6 +6,6 @@ use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT};
#[allow(dead_code)]
static FOO: AtomicIsize = AtomicIsize::new(0);
-//~^ WARN use of deprecated item
+//~^ WARN use of deprecated constant
fn main() {}
diff --git a/src/test/ui/deprecation/atomic_initializers.rs b/src/test/ui/deprecation/atomic_initializers.rs
index b15a1bbfd92d6..1dcfd36d7d575 100644
--- a/src/test/ui/deprecation/atomic_initializers.rs
+++ b/src/test/ui/deprecation/atomic_initializers.rs
@@ -6,6 +6,6 @@ use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT};
#[allow(dead_code)]
static FOO: AtomicIsize = ATOMIC_ISIZE_INIT;
-//~^ WARN use of deprecated item
+//~^ WARN use of deprecated constant
fn main() {}
diff --git a/src/test/ui/deprecation/atomic_initializers.stderr b/src/test/ui/deprecation/atomic_initializers.stderr
index 75baf4a1bf90d..eaf5c61b440bd 100644
--- a/src/test/ui/deprecation/atomic_initializers.stderr
+++ b/src/test/ui/deprecation/atomic_initializers.stderr
@@ -1,8 +1,8 @@
-warning: use of deprecated item 'std::sync::atomic::ATOMIC_ISIZE_INIT': the `new` function is now preferred
+warning: use of deprecated constant `std::sync::atomic::ATOMIC_ISIZE_INIT`: the `new` function is now preferred
--> $DIR/atomic_initializers.rs:8:27
|
LL | static FOO: AtomicIsize = ATOMIC_ISIZE_INIT;
- | ^^^^^^^^^^^^^^^^^ help: replace the use of the deprecated item: `AtomicIsize::new(0)`
+ | ^^^^^^^^^^^^^^^^^ help: replace the use of the deprecated constant: `AtomicIsize::new(0)`
|
= note: `#[warn(deprecated)]` on by default
diff --git a/src/test/ui/deprecation/deprecation-in-future.rs b/src/test/ui/deprecation/deprecation-in-future.rs
index bfeab49548f0e..53826183d06da 100644
--- a/src/test/ui/deprecation/deprecation-in-future.rs
+++ b/src/test/ui/deprecation/deprecation-in-future.rs
@@ -7,7 +7,7 @@ pub fn deprecated_future() {}
fn test() {
deprecated_future(); // ok; deprecated_in_future only applies to rustc_deprecated
- //~^ WARNING use of deprecated item 'deprecated_future': text [deprecated]
+ //~^ WARNING use of deprecated function `deprecated_future`: text [deprecated]
}
fn main() {}
diff --git a/src/test/ui/deprecation/deprecation-in-future.stderr b/src/test/ui/deprecation/deprecation-in-future.stderr
index 3040dcd9939fe..6561ec74349e8 100644
--- a/src/test/ui/deprecation/deprecation-in-future.stderr
+++ b/src/test/ui/deprecation/deprecation-in-future.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'deprecated_future': text
+warning: use of deprecated function `deprecated_future`: text
--> $DIR/deprecation-in-future.rs:9:5
|
LL | deprecated_future(); // ok; deprecated_in_future only applies to rustc_deprecated
diff --git a/src/test/ui/deprecation/deprecation-lint-2.rs b/src/test/ui/deprecation/deprecation-lint-2.rs
index 2aa0d0c64d212..16ed6d4ecd6eb 100644
--- a/src/test/ui/deprecation/deprecation-lint-2.rs
+++ b/src/test/ui/deprecation/deprecation-lint-2.rs
@@ -1,5 +1,5 @@
// aux-build:deprecation-lint.rs
-// error-pattern: use of deprecated item
+// error-pattern: use of deprecated function
#![deny(deprecated)]
diff --git a/src/test/ui/deprecation/deprecation-lint-2.stderr b/src/test/ui/deprecation/deprecation-lint-2.stderr
index 65152a2f9ab6d..b81d4bf402a57 100644
--- a/src/test/ui/deprecation/deprecation-lint-2.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-2.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'deprecation_lint::deprecated': text
+error: use of deprecated function `deprecation_lint::deprecated`: text
--> $DIR/deprecation-lint-2.rs:12:5
|
LL | macro_test!();
diff --git a/src/test/ui/deprecation/deprecation-lint-3.rs b/src/test/ui/deprecation/deprecation-lint-3.rs
index ae2dd7aac8155..e6e1587daeb46 100644
--- a/src/test/ui/deprecation/deprecation-lint-3.rs
+++ b/src/test/ui/deprecation/deprecation-lint-3.rs
@@ -1,5 +1,5 @@
// aux-build:deprecation-lint.rs
-// error-pattern: use of deprecated item
+// error-pattern: use of deprecated function
#![deny(deprecated)]
#![allow(warnings)]
diff --git a/src/test/ui/deprecation/deprecation-lint-3.stderr b/src/test/ui/deprecation/deprecation-lint-3.stderr
index b450f74d7f367..6f7cd9be2dd7b 100644
--- a/src/test/ui/deprecation/deprecation-lint-3.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-3.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'deprecation_lint::deprecated_text': text
+error: use of deprecated function `deprecation_lint::deprecated_text`: text
--> $DIR/deprecation-lint-3.rs:13:5
|
LL | macro_test_arg_nested!(deprecated_text);
diff --git a/src/test/ui/deprecation/deprecation-lint-nested.rs b/src/test/ui/deprecation/deprecation-lint-nested.rs
index ee6f0a22363f9..589522cdbdf48 100644
--- a/src/test/ui/deprecation/deprecation-lint-nested.rs
+++ b/src/test/ui/deprecation/deprecation-lint-nested.rs
@@ -52,19 +52,19 @@ mod loud {
#[deprecated]
const DEPRECATED_CONST: u8 = 1;
- struct Foo(DeprecatedType); //~ ERROR use of deprecated item
+ struct Foo(DeprecatedType); //~ ERROR use of deprecated type alias
- impl DeprecatedTrait for Foo {} //~ ERROR use of deprecated item
+ impl DeprecatedTrait for Foo {} //~ ERROR use of deprecated trait
impl Foo {
- fn bar() { //~ ERROR use of deprecated item
- deprecated_fn(); //~ ERROR use of deprecated item
+ fn bar() { //~ ERROR use of deprecated trait
+ deprecated_fn(); //~ ERROR use of deprecated function
}
}
fn foo() -> u8 {
- DEPRECATED_STATIC + //~ ERROR use of deprecated item
- DEPRECATED_CONST //~ ERROR use of deprecated item
+ DEPRECATED_STATIC + //~ ERROR use of deprecated static
+ DEPRECATED_CONST //~ ERROR use of deprecated const
}
}
diff --git a/src/test/ui/deprecation/deprecation-lint-nested.stderr b/src/test/ui/deprecation/deprecation-lint-nested.stderr
index b71f90014fe6e..47607b8cc7c18 100644
--- a/src/test/ui/deprecation/deprecation-lint-nested.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-nested.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'loud::DeprecatedType'
+error: use of deprecated type alias `loud::DeprecatedType`
--> $DIR/deprecation-lint-nested.rs:55:16
|
LL | struct Foo(DeprecatedType);
@@ -10,31 +10,31 @@ note: the lint level is defined here
LL | #![deny(deprecated)]
| ^^^^^^^^^^
-error: use of deprecated item 'loud::DeprecatedTrait'
+error: use of deprecated trait `loud::DeprecatedTrait`
--> $DIR/deprecation-lint-nested.rs:57:10
|
LL | impl DeprecatedTrait for Foo {}
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'loud::DEPRECATED_STATIC'
+error: use of deprecated static `loud::DEPRECATED_STATIC`
--> $DIR/deprecation-lint-nested.rs:66:9
|
LL | DEPRECATED_STATIC +
| ^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'loud::DEPRECATED_CONST'
+error: use of deprecated constant `loud::DEPRECATED_CONST`
--> $DIR/deprecation-lint-nested.rs:67:9
|
LL | DEPRECATED_CONST
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'loud::DeprecatedTrait'
+error: use of deprecated trait `loud::DeprecatedTrait`
--> $DIR/deprecation-lint-nested.rs:60:19
|
LL | fn bar() {
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'loud::deprecated_fn'
+error: use of deprecated function `loud::deprecated_fn`
--> $DIR/deprecation-lint-nested.rs:61:13
|
LL | deprecated_fn();
diff --git a/src/test/ui/deprecation/deprecation-lint.rs b/src/test/ui/deprecation/deprecation-lint.rs
index 26271395005a7..1932344fc5723 100644
--- a/src/test/ui/deprecation/deprecation-lint.rs
+++ b/src/test/ui/deprecation/deprecation-lint.rs
@@ -14,86 +14,86 @@ mod cross_crate {
type Foo = MethodTester;
let foo = MethodTester;
- deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated'
- foo.method_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated'
- Foo::method_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated'
- ::method_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated'
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
-
- deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text
- foo.method_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
- Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
- ::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
-
- let _ = DeprecatedStruct { //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedStruct': text
- i: 0 //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedStruct::i': text
+ deprecated(); //~ ERROR use of deprecated function `deprecation_lint::deprecated`
+ foo.method_deprecated(); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`
+ Foo::method_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`
+ ::method_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+
+ deprecated_text(); //~ ERROR use of deprecated function `deprecation_lint::deprecated_text`: text
+ foo.method_deprecated_text(); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
+ Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
+ ::method_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+
+ let _ = DeprecatedStruct { //~ ERROR use of deprecated struct `deprecation_lint::DeprecatedStruct`: text
+ i: 0 //~ ERROR use of deprecated field `deprecation_lint::DeprecatedStruct::i`: text
};
- let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedUnitStruct': text
+ let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated struct `deprecation_lint::DeprecatedUnitStruct`: text
- let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'deprecation_lint::Enum::DeprecatedVariant': text
+ let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated variant `deprecation_lint::Enum::DeprecatedVariant`: text
- let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTupleStruct': text
+ let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated struct `deprecation_lint::DeprecatedTupleStruct`: text
- let _ = nested::DeprecatedStruct { //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedStruct': text
- i: 0 //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedStruct::i': text
+ let _ = nested::DeprecatedStruct { //~ ERROR use of deprecated struct `deprecation_lint::nested::DeprecatedStruct`: text
+ i: 0 //~ ERROR use of deprecated field `deprecation_lint::nested::DeprecatedStruct::i`: text
};
- let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedUnitStruct': text
+ let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated struct `deprecation_lint::nested::DeprecatedUnitStruct`: text
- let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'deprecation_lint::nested::Enum::DeprecatedVariant': text
+ let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated variant `deprecation_lint::nested::Enum::DeprecatedVariant`: text
- let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedTupleStruct': text
+ let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated struct `deprecation_lint::nested::DeprecatedTupleStruct`: text
// At the moment, the lint checker only checks stability in
// in the arguments of macros.
// Eventually, we will want to lint the contents of the
// macro in the module *defining* it. Also, stability levels
// on macros themselves are not yet linted.
- macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text
- macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text
+ macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated function `deprecation_lint::deprecated_text`: text
+ macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated function `deprecation_lint::deprecated_text`: text
}
fn test_method_param(foo: Foo) {
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
}
fn test_method_object(foo: &Trait) {
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
}
struct S;
- impl DeprecatedTrait for S {} //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTrait': text
- trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTrait': text
+ impl DeprecatedTrait for S {} //~ ERROR use of deprecated trait `deprecation_lint::DeprecatedTrait`: text
+ trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated trait `deprecation_lint::DeprecatedTrait`: text
pub fn foo() {
let x = Stable {
override2: 3,
- //~^ ERROR use of deprecated item 'deprecation_lint::Stable::override2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Stable::override2`: text
};
let _ = x.override2;
- //~^ ERROR use of deprecated item 'deprecation_lint::Stable::override2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Stable::override2`: text
let Stable {
override2: _
- //~^ ERROR use of deprecated item 'deprecation_lint::Stable::override2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Stable::override2`: text
} = x;
// all fine
let Stable { .. } = x;
@@ -101,56 +101,56 @@ mod cross_crate {
let x = Stable2(1, 2, 3);
let _ = x.2;
- //~^ ERROR use of deprecated item 'deprecation_lint::Stable2::2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Stable2::2`: text
let Stable2(_,
_,
_)
- //~^ ERROR use of deprecated item 'deprecation_lint::Stable2::2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Stable2::2`: text
= x;
// all fine
let Stable2(..) = x;
let x = Deprecated {
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated`: text
inherit: 1,
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated::inherit`: text
};
let _ = x.inherit;
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated::inherit`: text
let Deprecated {
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated`: text
inherit: _,
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated::inherit`: text
} = x;
let Deprecated
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated`: text
{ .. } = x;
let x = Deprecated2(1, 2, 3);
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated2`: text
let _ = x.0;
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::0': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::0`: text
let _ = x.1;
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::1': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::1`: text
let _ = x.2;
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::2`: text
let Deprecated2
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated2`: text
(_,
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::0': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::0`: text
_,
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::1': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::1`: text
_)
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2::2': text
+ //~^ ERROR use of deprecated field `deprecation_lint::Deprecated2::2`: text
= x;
let Deprecated2
- //~^ ERROR use of deprecated item 'deprecation_lint::Deprecated2': text
+ //~^ ERROR use of deprecated struct `deprecation_lint::Deprecated2`: text
// the patterns are all fine:
(..) = x;
}
@@ -160,7 +160,7 @@ mod inheritance {
use deprecation_lint::*;
fn test_inheritance() {
- deprecated_mod::deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_mod::deprecated': text
+ deprecated_mod::deprecated(); //~ ERROR use of deprecated function `deprecation_lint::deprecated_mod::deprecated`: text
}
}
@@ -243,65 +243,65 @@ mod this_crate {
type Foo = MethodTester;
let foo = MethodTester;
- deprecated(); //~ ERROR use of deprecated item 'this_crate::deprecated'
- foo.method_deprecated(); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated'
- Foo::method_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated'
- ::method_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated'
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
-
- deprecated_text(); //~ ERROR use of deprecated item 'this_crate::deprecated_text': text
- foo.method_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- ::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ deprecated(); //~ ERROR use of deprecated function `this_crate::deprecated`
+ foo.method_deprecated(); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ Foo::method_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ ::method_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+
+ deprecated_text(); //~ ERROR use of deprecated function `this_crate::deprecated_text`: text
+ foo.method_deprecated_text(); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ ::method_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
// Future deprecations are only permitted for rustc_deprecated.
- deprecated_future(); //~ ERROR use of deprecated item
- deprecated_future_text(); //~ ERROR use of deprecated item
+ deprecated_future(); //~ ERROR use of deprecated function
+ deprecated_future_text(); //~ ERROR use of deprecated function
let _ = DeprecatedStruct {
- //~^ ERROR use of deprecated item 'this_crate::DeprecatedStruct': text
- i: 0 //~ ERROR use of deprecated item 'this_crate::DeprecatedStruct::i': text
+ //~^ ERROR use of deprecated struct `this_crate::DeprecatedStruct`: text
+ i: 0 //~ ERROR use of deprecated field `this_crate::DeprecatedStruct::i`: text
};
- let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item 'this_crate::DeprecatedUnitStruct': text
+ let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated unit struct `this_crate::DeprecatedUnitStruct`: text
- let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'this_crate::Enum::DeprecatedVariant': text
+ let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated unit variant `this_crate::Enum::DeprecatedVariant`: text
- let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'this_crate::DeprecatedTupleStruct': text
+ let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated tuple struct `this_crate::DeprecatedTupleStruct`: text
let _ = nested::DeprecatedStruct {
- //~^ ERROR use of deprecated item 'this_crate::nested::DeprecatedStruct': text
- i: 0 //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedStruct::i': text
+ //~^ ERROR use of deprecated struct `this_crate::nested::DeprecatedStruct`: text
+ i: 0 //~ ERROR use of deprecated field `this_crate::nested::DeprecatedStruct::i`: text
};
- let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedUnitStruct': text
+ let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated unit struct `this_crate::nested::DeprecatedUnitStruct`: text
- let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'this_crate::nested::Enum::DeprecatedVariant': text
+ let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated unit variant `this_crate::nested::Enum::DeprecatedVariant`: text
- let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedTupleStruct': text
+ let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated tuple struct `this_crate::nested::DeprecatedTupleStruct`: text
}
fn test_method_param(foo: Foo) {
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
}
fn test_method_object(foo: &Trait) {
- foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ ERROR use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
}
#[deprecated(since = "1.0.0", note = "text")]
@@ -314,7 +314,7 @@ mod this_crate {
let _ = || {
#[deprecated]
fn bar() { }
- bar(); //~ ERROR use of deprecated item 'this_crate::test_fn_closure_body::{{closure}}#0::bar'
+ bar(); //~ ERROR use of deprecated function `this_crate::test_fn_closure_body::{{closure}}#0::bar`
};
}
@@ -333,9 +333,9 @@ mod this_crate {
struct S;
- impl DeprecatedTrait for S { } //~ ERROR use of deprecated item 'this_crate::DeprecatedTrait': text
+ impl DeprecatedTrait for S { } //~ ERROR use of deprecated trait `this_crate::DeprecatedTrait`: text
- trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated item 'this_crate::DeprecatedTrait': text
+ trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated trait `this_crate::DeprecatedTrait`: text
}
mod this_crate2 {
@@ -361,15 +361,15 @@ mod this_crate2 {
pub fn foo() {
let x = Stable {
override2: 3,
- //~^ ERROR use of deprecated item 'this_crate2::Stable::override2': text
+ //~^ ERROR use of deprecated field `this_crate2::Stable::override2`: text
};
let _ = x.override2;
- //~^ ERROR use of deprecated item 'this_crate2::Stable::override2': text
+ //~^ ERROR use of deprecated field `this_crate2::Stable::override2`: text
let Stable {
override2: _
- //~^ ERROR use of deprecated item 'this_crate2::Stable::override2': text
+ //~^ ERROR use of deprecated field `this_crate2::Stable::override2`: text
} = x;
// all fine
let Stable { .. } = x;
@@ -377,57 +377,57 @@ mod this_crate2 {
let x = Stable2(1, 2, 3);
let _ = x.2;
- //~^ ERROR use of deprecated item 'this_crate2::Stable2::2': text
+ //~^ ERROR use of deprecated field `this_crate2::Stable2::2`: text
let Stable2(_,
_,
_)
- //~^ ERROR use of deprecated item 'this_crate2::Stable2::2': text
+ //~^ ERROR use of deprecated field `this_crate2::Stable2::2`: text
= x;
// all fine
let Stable2(..) = x;
let x = Deprecated {
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated': text
+ //~^ ERROR use of deprecated struct `this_crate2::Deprecated`: text
inherit: 1,
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated::inherit`: text
};
let _ = x.inherit;
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated::inherit`: text
let Deprecated {
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated': text
+ //~^ ERROR use of deprecated struct `this_crate2::Deprecated`: text
inherit: _,
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated::inherit': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated::inherit`: text
} = x;
let Deprecated
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated': text
+ //~^ ERROR use of deprecated struct `this_crate2::Deprecated`: text
// the patterns are all fine:
{ .. } = x;
let x = Deprecated2(1, 2, 3);
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2': text
+ //~^ ERROR use of deprecated tuple struct `this_crate2::Deprecated2`: text
let _ = x.0;
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::0': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::0`: text
let _ = x.1;
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::1': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::1`: text
let _ = x.2;
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::2': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::2`: text
let Deprecated2
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2': text
+ //~^ ERROR use of deprecated tuple struct `this_crate2::Deprecated2`: text
(_,
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::0': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::0`: text
_,
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::1': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::1`: text
_)
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2::2': text
+ //~^ ERROR use of deprecated field `this_crate2::Deprecated2::2`: text
= x;
let Deprecated2
- //~^ ERROR use of deprecated item 'this_crate2::Deprecated2': text
+ //~^ ERROR use of deprecated tuple struct `this_crate2::Deprecated2`: text
// the patterns are all fine:
(..) = x;
}
diff --git a/src/test/ui/deprecation/deprecation-lint.stderr b/src/test/ui/deprecation/deprecation-lint.stderr
index 362a901d77d44..03a2ec7edc916 100644
--- a/src/test/ui/deprecation/deprecation-lint.stderr
+++ b/src/test/ui/deprecation/deprecation-lint.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'deprecation_lint::deprecated': text
+error: use of deprecated function `deprecation_lint::deprecated`: text
--> $DIR/deprecation-lint.rs:17:9
|
LL | deprecated();
@@ -10,727 +10,727 @@ note: the lint level is defined here
LL | #![deny(deprecated)]
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:22:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:24:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::deprecated_text': text
+error: use of deprecated function `deprecation_lint::deprecated_text`: text
--> $DIR/deprecation-lint.rs:26:9
|
LL | deprecated_text();
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:31:9
|
-LL | Trait::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:33:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedStruct': text
+error: use of deprecated struct `deprecation_lint::DeprecatedStruct`: text
--> $DIR/deprecation-lint.rs:35:17
|
LL | let _ = DeprecatedStruct {
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedUnitStruct': text
+error: use of deprecated struct `deprecation_lint::DeprecatedUnitStruct`: text
--> $DIR/deprecation-lint.rs:39:17
|
LL | let _ = DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Enum::DeprecatedVariant': text
+error: use of deprecated variant `deprecation_lint::Enum::DeprecatedVariant`: text
--> $DIR/deprecation-lint.rs:41:17
|
LL | let _ = Enum::DeprecatedVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedTupleStruct': text
+error: use of deprecated struct `deprecation_lint::DeprecatedTupleStruct`: text
--> $DIR/deprecation-lint.rs:43:17
|
LL | let _ = DeprecatedTupleStruct (1);
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::nested::DeprecatedStruct': text
+error: use of deprecated struct `deprecation_lint::nested::DeprecatedStruct`: text
--> $DIR/deprecation-lint.rs:45:17
|
LL | let _ = nested::DeprecatedStruct {
| ^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::nested::DeprecatedUnitStruct': text
+error: use of deprecated struct `deprecation_lint::nested::DeprecatedUnitStruct`: text
--> $DIR/deprecation-lint.rs:49:17
|
LL | let _ = nested::DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::nested::Enum::DeprecatedVariant': text
+error: use of deprecated variant `deprecation_lint::nested::Enum::DeprecatedVariant`: text
--> $DIR/deprecation-lint.rs:51:17
|
-LL | let _ = nested::Enum::DeprecatedVariant;
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... let _ = nested::Enum::DeprecatedVariant;
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::nested::DeprecatedTupleStruct': text
+error: use of deprecated struct `deprecation_lint::nested::DeprecatedTupleStruct`: text
--> $DIR/deprecation-lint.rs:53:17
|
-LL | let _ = nested::DeprecatedTupleStruct (1);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... let _ = nested::DeprecatedTupleStruct (1);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::deprecated_text': text
+error: use of deprecated function `deprecation_lint::deprecated_text`: text
--> $DIR/deprecation-lint.rs:60:25
|
LL | macro_test_arg!(deprecated_text());
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::deprecated_text': text
+error: use of deprecated function `deprecation_lint::deprecated_text`: text
--> $DIR/deprecation-lint.rs:61:41
|
LL | macro_test_arg!(macro_test_arg!(deprecated_text()));
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:66:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:68:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:70:9
|
-LL | Trait::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:72:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedTrait': text
+error: use of deprecated trait `deprecation_lint::DeprecatedTrait`: text
--> $DIR/deprecation-lint.rs:82:10
|
LL | impl DeprecatedTrait for S {}
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedTrait': text
+error: use of deprecated trait `deprecation_lint::DeprecatedTrait`: text
--> $DIR/deprecation-lint.rs:83:24
|
LL | trait LocalTrait : DeprecatedTrait { }
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated': text
+error: use of deprecated struct `deprecation_lint::Deprecated`: text
--> $DIR/deprecation-lint.rs:114:17
|
LL | let x = Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated': text
+error: use of deprecated struct `deprecation_lint::Deprecated`: text
--> $DIR/deprecation-lint.rs:123:13
|
LL | let Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated': text
+error: use of deprecated struct `deprecation_lint::Deprecated`: text
--> $DIR/deprecation-lint.rs:129:13
|
LL | let Deprecated
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2': text
+error: use of deprecated struct `deprecation_lint::Deprecated2`: text
--> $DIR/deprecation-lint.rs:133:17
|
LL | let x = Deprecated2(1, 2, 3);
| ^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2': text
+error: use of deprecated struct `deprecation_lint::Deprecated2`: text
--> $DIR/deprecation-lint.rs:143:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2': text
+error: use of deprecated struct `deprecation_lint::Deprecated2`: text
--> $DIR/deprecation-lint.rs:152:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::deprecated_mod::deprecated': text
+error: use of deprecated function `deprecation_lint::deprecated_mod::deprecated`: text
--> $DIR/deprecation-lint.rs:163:9
|
LL | deprecated_mod::deprecated();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::deprecated': text
+error: use of deprecated function `this_crate::deprecated`: text
--> $DIR/deprecation-lint.rs:246:9
|
LL | deprecated();
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:251:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:253:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::deprecated_text': text
+error: use of deprecated function `this_crate::deprecated_text`: text
--> $DIR/deprecation-lint.rs:255:9
|
LL | deprecated_text();
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:260:9
|
LL | Trait::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:262:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::deprecated_future': text
+error: use of deprecated function `this_crate::deprecated_future`: text
--> $DIR/deprecation-lint.rs:265:9
|
LL | deprecated_future();
| ^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::deprecated_future_text': text
+error: use of deprecated function `this_crate::deprecated_future_text`: text
--> $DIR/deprecation-lint.rs:266:9
|
LL | deprecated_future_text();
| ^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::DeprecatedStruct': text
+error: use of deprecated struct `this_crate::DeprecatedStruct`: text
--> $DIR/deprecation-lint.rs:268:17
|
LL | let _ = DeprecatedStruct {
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::DeprecatedUnitStruct': text
+error: use of deprecated unit struct `this_crate::DeprecatedUnitStruct`: text
--> $DIR/deprecation-lint.rs:273:17
|
LL | let _ = DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Enum::DeprecatedVariant': text
+error: use of deprecated unit variant `this_crate::Enum::DeprecatedVariant`: text
--> $DIR/deprecation-lint.rs:275:17
|
LL | let _ = Enum::DeprecatedVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::DeprecatedTupleStruct': text
+error: use of deprecated tuple struct `this_crate::DeprecatedTupleStruct`: text
--> $DIR/deprecation-lint.rs:277:17
|
LL | let _ = DeprecatedTupleStruct (1);
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::nested::DeprecatedStruct': text
+error: use of deprecated struct `this_crate::nested::DeprecatedStruct`: text
--> $DIR/deprecation-lint.rs:279:17
|
LL | let _ = nested::DeprecatedStruct {
| ^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::nested::DeprecatedUnitStruct': text
+error: use of deprecated unit struct `this_crate::nested::DeprecatedUnitStruct`: text
--> $DIR/deprecation-lint.rs:284:17
|
LL | let _ = nested::DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::nested::Enum::DeprecatedVariant': text
+error: use of deprecated unit variant `this_crate::nested::Enum::DeprecatedVariant`: text
--> $DIR/deprecation-lint.rs:286:17
|
-LL | let _ = nested::Enum::DeprecatedVariant;
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... let _ = nested::Enum::DeprecatedVariant;
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::nested::DeprecatedTupleStruct': text
+error: use of deprecated tuple struct `this_crate::nested::DeprecatedTupleStruct`: text
--> $DIR/deprecation-lint.rs:288:17
|
-LL | let _ = nested::DeprecatedTupleStruct (1);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... let _ = nested::DeprecatedTupleStruct (1);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:293:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:295:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:297:9
|
LL | Trait::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:299:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::test_fn_closure_body::{{closure}}#0::bar'
+error: use of deprecated function `this_crate::test_fn_closure_body::{{closure}}#0::bar`
--> $DIR/deprecation-lint.rs:317:13
|
LL | bar();
| ^^^
-error: use of deprecated item 'this_crate::DeprecatedTrait': text
+error: use of deprecated trait `this_crate::DeprecatedTrait`: text
--> $DIR/deprecation-lint.rs:336:10
|
LL | impl DeprecatedTrait for S { }
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::DeprecatedTrait': text
+error: use of deprecated trait `this_crate::DeprecatedTrait`: text
--> $DIR/deprecation-lint.rs:338:24
|
LL | trait LocalTrait : DeprecatedTrait { }
| ^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated': text
+error: use of deprecated struct `this_crate2::Deprecated`: text
--> $DIR/deprecation-lint.rs:390:17
|
LL | let x = Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated': text
+error: use of deprecated struct `this_crate2::Deprecated`: text
--> $DIR/deprecation-lint.rs:399:13
|
LL | let Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated': text
+error: use of deprecated struct `this_crate2::Deprecated`: text
--> $DIR/deprecation-lint.rs:405:13
|
LL | let Deprecated
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated2': text
+error: use of deprecated tuple struct `this_crate2::Deprecated2`: text
--> $DIR/deprecation-lint.rs:410:17
|
LL | let x = Deprecated2(1, 2, 3);
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated2': text
+error: use of deprecated tuple struct `this_crate2::Deprecated2`: text
--> $DIR/deprecation-lint.rs:420:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated2': text
+error: use of deprecated tuple struct `this_crate2::Deprecated2`: text
--> $DIR/deprecation-lint.rs:429:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:18:13
|
LL | foo.method_deprecated();
| ^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:19:9
|
LL | Foo::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:20:9
|
LL | ::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:21:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:23:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:27:13
|
-LL | foo.method_deprecated_text();
- | ^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.method_deprecated_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:28:9
|
-LL | Foo::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Foo::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:29:9
|
-LL | ::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:30:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:32:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::DeprecatedStruct::i': text
+error: use of deprecated field `deprecation_lint::DeprecatedStruct::i`: text
--> $DIR/deprecation-lint.rs:36:13
|
LL | i: 0
| ^^^^
-error: use of deprecated item 'deprecation_lint::nested::DeprecatedStruct::i': text
+error: use of deprecated field `deprecation_lint::nested::DeprecatedStruct::i`: text
--> $DIR/deprecation-lint.rs:46:13
|
LL | i: 0
| ^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:65:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:67:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:69:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:71:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:76:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `deprecation_lint::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:77:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Stable::override2': text
+error: use of deprecated field `deprecation_lint::Stable::override2`: text
--> $DIR/deprecation-lint.rs:87:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Stable::override2': text
+error: use of deprecated field `deprecation_lint::Stable::override2`: text
--> $DIR/deprecation-lint.rs:91:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Stable::override2': text
+error: use of deprecated field `deprecation_lint::Stable::override2`: text
--> $DIR/deprecation-lint.rs:95:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Stable2::2': text
+error: use of deprecated field `deprecation_lint::Stable2::2`: text
--> $DIR/deprecation-lint.rs:103:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'deprecation_lint::Stable2::2': text
+error: use of deprecated field `deprecation_lint::Stable2::2`: text
--> $DIR/deprecation-lint.rs:108:20
|
LL | _)
| ^
-error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+error: use of deprecated field `deprecation_lint::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:116:13
|
LL | inherit: 1,
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+error: use of deprecated field `deprecation_lint::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:120:17
|
LL | let _ = x.inherit;
| ^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text
+error: use of deprecated field `deprecation_lint::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:125:13
|
LL | inherit: _,
| ^^^^^^^^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2::0': text
+error: use of deprecated field `deprecation_lint::Deprecated2::0`: text
--> $DIR/deprecation-lint.rs:136:17
|
LL | let _ = x.0;
| ^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2::1': text
+error: use of deprecated field `deprecation_lint::Deprecated2::1`: text
--> $DIR/deprecation-lint.rs:138:17
|
LL | let _ = x.1;
| ^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2::2': text
+error: use of deprecated field `deprecation_lint::Deprecated2::2`: text
--> $DIR/deprecation-lint.rs:140:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'deprecation_lint::Deprecated2::0': text
+error: use of deprecated field `deprecation_lint::Deprecated2::0`: text
--> $DIR/deprecation-lint.rs:145:14
|
LL | (_,
| ^
-error: use of deprecated item 'deprecation_lint::Deprecated2::1': text
+error: use of deprecated field `deprecation_lint::Deprecated2::1`: text
--> $DIR/deprecation-lint.rs:147:14
|
LL | _,
| ^
-error: use of deprecated item 'deprecation_lint::Deprecated2::2': text
+error: use of deprecated field `deprecation_lint::Deprecated2::2`: text
--> $DIR/deprecation-lint.rs:149:14
|
LL | _)
| ^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:247:13
|
LL | foo.method_deprecated();
| ^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:248:9
|
LL | Foo::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/deprecation-lint.rs:249:9
|
LL | ::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:250:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:252:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:256:13
|
-LL | foo.method_deprecated_text();
- | ^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.method_deprecated_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:257:9
|
-LL | Foo::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Foo::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+error: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/deprecation-lint.rs:258:9
|
-LL | ::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:259:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:261:9
|
LL | ::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::DeprecatedStruct::i': text
+error: use of deprecated field `this_crate::DeprecatedStruct::i`: text
--> $DIR/deprecation-lint.rs:270:13
|
LL | i: 0
| ^^^^
-error: use of deprecated item 'this_crate::nested::DeprecatedStruct::i': text
+error: use of deprecated field `this_crate::nested::DeprecatedStruct::i`: text
--> $DIR/deprecation-lint.rs:281:13
|
LL | i: 0
| ^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:292:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:294:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:296:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:298:9
|
LL | ::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/deprecation-lint.rs:303:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+error: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/deprecation-lint.rs:304:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Stable::override2': text
+error: use of deprecated field `this_crate2::Stable::override2`: text
--> $DIR/deprecation-lint.rs:363:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Stable::override2': text
+error: use of deprecated field `this_crate2::Stable::override2`: text
--> $DIR/deprecation-lint.rs:367:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Stable::override2': text
+error: use of deprecated field `this_crate2::Stable::override2`: text
--> $DIR/deprecation-lint.rs:371:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Stable2::2': text
+error: use of deprecated field `this_crate2::Stable2::2`: text
--> $DIR/deprecation-lint.rs:379:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'this_crate2::Stable2::2': text
+error: use of deprecated field `this_crate2::Stable2::2`: text
--> $DIR/deprecation-lint.rs:384:20
|
LL | _)
| ^
-error: use of deprecated item 'this_crate2::Deprecated::inherit': text
+error: use of deprecated field `this_crate2::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:392:13
|
LL | inherit: 1,
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated::inherit': text
+error: use of deprecated field `this_crate2::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:396:17
|
LL | let _ = x.inherit;
| ^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated::inherit': text
+error: use of deprecated field `this_crate2::Deprecated::inherit`: text
--> $DIR/deprecation-lint.rs:401:13
|
LL | inherit: _,
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate2::Deprecated2::0': text
+error: use of deprecated field `this_crate2::Deprecated2::0`: text
--> $DIR/deprecation-lint.rs:413:17
|
LL | let _ = x.0;
| ^^^
-error: use of deprecated item 'this_crate2::Deprecated2::1': text
+error: use of deprecated field `this_crate2::Deprecated2::1`: text
--> $DIR/deprecation-lint.rs:415:17
|
LL | let _ = x.1;
| ^^^
-error: use of deprecated item 'this_crate2::Deprecated2::2': text
+error: use of deprecated field `this_crate2::Deprecated2::2`: text
--> $DIR/deprecation-lint.rs:417:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'this_crate2::Deprecated2::0': text
+error: use of deprecated field `this_crate2::Deprecated2::0`: text
--> $DIR/deprecation-lint.rs:422:14
|
LL | (_,
| ^
-error: use of deprecated item 'this_crate2::Deprecated2::1': text
+error: use of deprecated field `this_crate2::Deprecated2::1`: text
--> $DIR/deprecation-lint.rs:424:14
|
LL | _,
| ^
-error: use of deprecated item 'this_crate2::Deprecated2::2': text
+error: use of deprecated field `this_crate2::Deprecated2::2`: text
--> $DIR/deprecation-lint.rs:426:14
|
LL | _)
diff --git a/src/test/ui/deprecation/rustc_deprecation-in-future.rs b/src/test/ui/deprecation/rustc_deprecation-in-future.rs
index a19363c512950..6a619bcc49c2d 100644
--- a/src/test/ui/deprecation/rustc_deprecation-in-future.rs
+++ b/src/test/ui/deprecation/rustc_deprecation-in-future.rs
@@ -11,5 +11,5 @@
pub struct S;
fn main() {
- let _ = S; //~ ERROR use of item 'S' that will be deprecated in future version 99.99.99: effectively never
+ let _ = S; //~ ERROR use of unit struct `S` that will be deprecated in future version 99.99.99: effectively never
}
diff --git a/src/test/ui/deprecation/rustc_deprecation-in-future.stderr b/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
index 4aff11ad66f18..e4f50d10dadd2 100644
--- a/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
+++ b/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
@@ -1,4 +1,4 @@
-error: use of item 'S' that will be deprecated in future version 99.99.99: effectively never
+error: use of unit struct `S` that will be deprecated in future version 99.99.99: effectively never
--> $DIR/rustc_deprecation-in-future.rs:14:13
|
LL | let _ = S;
diff --git a/src/test/ui/deprecation/suggestion.stderr b/src/test/ui/deprecation/suggestion.stderr
index b60d420b54689..8a7cb1def909e 100644
--- a/src/test/ui/deprecation/suggestion.stderr
+++ b/src/test/ui/deprecation/suggestion.stderr
@@ -1,8 +1,8 @@
-error: use of deprecated item 'Foo::deprecated': replaced by `replacement`
+error: use of deprecated associated function `Foo::deprecated`: replaced by `replacement`
--> $DIR/suggestion.rs:27:9
|
LL | foo.deprecated();
- | ^^^^^^^^^^ help: replace the use of the deprecated item: `replacement`
+ | ^^^^^^^^^^ help: replace the use of the deprecated associated function: `replacement`
|
note: the lint level is defined here
--> $DIR/suggestion.rs:7:9
diff --git a/src/test/ui/issues/issue-17337.rs b/src/test/ui/issues/issue-17337.rs
index 65f2f8fc5ac6c..3fd81401e00fd 100644
--- a/src/test/ui/issues/issue-17337.rs
+++ b/src/test/ui/issues/issue-17337.rs
@@ -13,5 +13,5 @@ impl Foo {
fn main() {
Foo
- .foo(); //~ ERROR use of deprecated item
+ .foo(); //~ ERROR use of deprecated
}
diff --git a/src/test/ui/issues/issue-17337.stderr b/src/test/ui/issues/issue-17337.stderr
index 4a8116b1ffdb9..34c2eb05fff8b 100644
--- a/src/test/ui/issues/issue-17337.stderr
+++ b/src/test/ui/issues/issue-17337.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'Foo::foo': text
+error: use of deprecated associated function `Foo::foo`: text
--> $DIR/issue-17337.rs:16:6
|
LL | .foo();
diff --git a/src/test/ui/issues/issue-18075.rs b/src/test/ui/issues/issue-18075.rs
index ee6845c1278b8..56ec629c61360 100644
--- a/src/test/ui/issues/issue-18075.rs
+++ b/src/test/ui/issues/issue-18075.rs
@@ -1,5 +1,5 @@
// run-pass
-// exec-env:RUSTC_LOG=rustc::middle=debug
+// rustc-env:RUSTC_LOG=rustc::middle=debug
fn main() {
let b = 1isize;
diff --git a/src/test/ui/issues/issue-34932.rs b/src/test/ui/issues/issue-34932.rs
index 3a5fd20ebc34e..ab568fd01efc5 100644
--- a/src/test/ui/issues/issue-34932.rs
+++ b/src/test/ui/issues/issue-34932.rs
@@ -1,6 +1,5 @@
// run-pass
// compile-flags:--test
-// rustc-env:RUSTC_BOOTSTRAP_KEY=
#![cfg(any())] // This test should be configured away
#![feature(rustc_attrs)] // Test that this is allowed on stable/beta
#![feature(iter_arith_traits)] // Test that this is not unused
diff --git a/src/test/ui/issues/issue-47511.stderr b/src/test/ui/issues/issue-47511.stderr
index 42f2cd1bb1401..4473c0e68cfc8 100644
--- a/src/test/ui/issues/issue-47511.stderr
+++ b/src/test/ui/issues/issue-47511.stderr
@@ -1,4 +1,4 @@
-error[E0581]: return type references an anonymous lifetime which is not constrained by the fn input types
+error[E0581]: return type references an anonymous lifetime, which is not constrained by the fn input types
--> $DIR/issue-47511.rs:5:15
|
LL | fn f(_: X) -> X {
diff --git a/src/test/ui/lint/lint-output-format-2.rs b/src/test/ui/lint/lint-output-format-2.rs
index 521472d99b17d..985166e095dfc 100644
--- a/src/test/ui/lint/lint-output-format-2.rs
+++ b/src/test/ui/lint/lint-output-format-2.rs
@@ -5,11 +5,11 @@
extern crate lint_output_format;
use lint_output_format::{foo, bar};
-//~^ WARNING use of deprecated item 'lint_output_format::foo': text
+//~^ WARNING use of deprecated function `lint_output_format::foo`: text
fn main() {
let _x = foo();
- //~^ WARNING use of deprecated item 'lint_output_format::foo': text
+ //~^ WARNING use of deprecated function `lint_output_format::foo`: text
let _y = bar();
}
diff --git a/src/test/ui/lint/lint-output-format-2.stderr b/src/test/ui/lint/lint-output-format-2.stderr
index a95fd69fb01c7..a36dbd61fdcea 100644
--- a/src/test/ui/lint/lint-output-format-2.stderr
+++ b/src/test/ui/lint/lint-output-format-2.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'lint_output_format::foo': text
+warning: use of deprecated function `lint_output_format::foo`: text
--> $DIR/lint-output-format-2.rs:7:26
|
LL | use lint_output_format::{foo, bar};
@@ -6,7 +6,7 @@ LL | use lint_output_format::{foo, bar};
|
= note: `#[warn(deprecated)]` on by default
-warning: use of deprecated item 'lint_output_format::foo': text
+warning: use of deprecated function `lint_output_format::foo`: text
--> $DIR/lint-output-format-2.rs:12:14
|
LL | let _x = foo();
diff --git a/src/test/ui/lint/lint-stability-deprecated.rs b/src/test/ui/lint/lint-stability-deprecated.rs
index 4b407a29f64b3..a6fde11495c5a 100644
--- a/src/test/ui/lint/lint-stability-deprecated.rs
+++ b/src/test/ui/lint/lint-stability-deprecated.rs
@@ -22,41 +22,41 @@ mod cross_crate {
type Foo = MethodTester;
let foo = MethodTester;
- deprecated(); //~ WARN use of deprecated item 'lint_stability::deprecated'
- foo.method_deprecated(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated'
- Foo::method_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated'
- ::method_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated'
- foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
-
- deprecated_text(); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text
- foo.method_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
- Foo::method_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
- ::method_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
-
- deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable'
- foo.method_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable'
- Foo::method_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable'
- ::method_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable'
- foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
-
- deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable_text': text
- foo.method_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
- Foo::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
- ::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
- foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+ deprecated(); //~ WARN use of deprecated function `lint_stability::deprecated`
+ foo.method_deprecated(); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated`
+ Foo::method_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated`
+ ::method_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated`
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+
+ deprecated_text(); //~ WARN use of deprecated function `lint_stability::deprecated_text`: text
+ foo.method_deprecated_text(); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
+ Foo::method_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
+ ::method_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+
+ deprecated_unstable(); //~ WARN use of deprecated function `lint_stability::deprecated_unstable`
+ foo.method_deprecated_unstable(); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`
+ Foo::method_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`
+ ::method_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`
+ foo.trait_deprecated_unstable(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+
+ deprecated_unstable_text(); //~ WARN use of deprecated function `lint_stability::deprecated_unstable_text`: text
+ foo.method_deprecated_unstable_text(); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
+ Foo::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
+ ::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
+ foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
unstable();
foo.method_unstable();
@@ -96,38 +96,38 @@ mod cross_crate {
struct S1(T::TypeUnstable);
struct S2(T::TypeDeprecated);
- //~^ WARN use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
- //~| WARN use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+ //~^ WARN use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
+ //~| WARN use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
type A = dyn TraitWithAssociatedTypes<
TypeUnstable = u8,
TypeDeprecated = u16,
- //~^ WARN use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated'
- //~| WARN use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated'
- //~| WARN use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated'
+ //~^ WARN use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`
+ //~| WARN use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`
+ //~| WARN use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`
>;
- let _ = DeprecatedStruct { //~ WARN use of deprecated item 'lint_stability::DeprecatedStruct'
- i: 0 //~ WARN use of deprecated item 'lint_stability::DeprecatedStruct::i'
+ let _ = DeprecatedStruct { //~ WARN use of deprecated struct `lint_stability::DeprecatedStruct`
+ i: 0 //~ WARN use of deprecated field `lint_stability::DeprecatedStruct::i`
};
let _ = DeprecatedUnstableStruct {
- //~^ WARN use of deprecated item 'lint_stability::DeprecatedUnstableStruct'
- i: 0 //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableStruct::i'
+ //~^ WARN use of deprecated struct `lint_stability::DeprecatedUnstableStruct`
+ i: 0 //~ WARN use of deprecated field `lint_stability::DeprecatedUnstableStruct::i`
};
let _ = UnstableStruct { i: 0 };
let _ = StableStruct { i: 0 };
- let _ = DeprecatedUnitStruct; //~ WARN use of deprecated item 'lint_stability::DeprecatedUnitStruct'
- let _ = DeprecatedUnstableUnitStruct; //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableUnitStruct'
+ let _ = DeprecatedUnitStruct; //~ WARN use of deprecated struct `lint_stability::DeprecatedUnitStruct`
+ let _ = DeprecatedUnstableUnitStruct; //~ WARN use of deprecated struct `lint_stability::DeprecatedUnstableUnitStruct`
let _ = UnstableUnitStruct;
let _ = StableUnitStruct;
- let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated item 'lint_stability::Enum::DeprecatedVariant'
- let _ = Enum::DeprecatedUnstableVariant; //~ WARN use of deprecated item 'lint_stability::Enum::DeprecatedUnstableVariant'
+ let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated variant `lint_stability::Enum::DeprecatedVariant`
+ let _ = Enum::DeprecatedUnstableVariant; //~ WARN use of deprecated variant `lint_stability::Enum::DeprecatedUnstableVariant`
let _ = Enum::UnstableVariant;
let _ = Enum::StableVariant;
- let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated item 'lint_stability::DeprecatedTupleStruct'
- let _ = DeprecatedUnstableTupleStruct (1); //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableTupleStruct'
+ let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated struct `lint_stability::DeprecatedTupleStruct`
+ let _ = DeprecatedUnstableTupleStruct (1); //~ WARN use of deprecated struct `lint_stability::DeprecatedUnstableTupleStruct`
let _ = UnstableTupleStruct (1);
let _ = StableTupleStruct (1);
@@ -136,28 +136,28 @@ mod cross_crate {
// Eventually, we will want to lint the contents of the
// macro in the module *defining* it. Also, stability levels
// on macros themselves are not yet linted.
- macro_test_arg!(deprecated_text()); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text
- macro_test_arg!(deprecated_unstable_text()); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable_text': text
- macro_test_arg!(macro_test_arg!(deprecated_text())); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text
+ macro_test_arg!(deprecated_text()); //~ WARN use of deprecated function `lint_stability::deprecated_text`: text
+ macro_test_arg!(deprecated_unstable_text()); //~ WARN use of deprecated function `lint_stability::deprecated_unstable_text`: text
+ macro_test_arg!(macro_test_arg!(deprecated_text())); //~ WARN use of deprecated function `lint_stability::deprecated_text`: text
}
fn test_method_param(foo: Foo) {
- foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
- ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ foo.trait_deprecated_unstable(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
+ ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
foo.trait_unstable();
Trait::trait_unstable(&foo);
::trait_unstable(&foo);
@@ -173,10 +173,10 @@ mod cross_crate {
}
fn test_method_object(foo: &dyn Trait) {
- foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
- foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable'
- foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
+ foo.trait_deprecated_unstable(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`
+ foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
foo.trait_unstable();
foo.trait_unstable_text();
foo.trait_stable();
@@ -185,9 +185,9 @@ mod cross_crate {
struct S;
impl UnstableTrait for S { }
- impl DeprecatedTrait for S {} //~ WARN use of deprecated item 'lint_stability::DeprecatedTrait': text
+ impl DeprecatedTrait for S {} //~ WARN use of deprecated trait `lint_stability::DeprecatedTrait`: text
trait LocalTrait : UnstableTrait { }
- trait LocalTrait2 : DeprecatedTrait { } //~ WARN use of deprecated item 'lint_stability::DeprecatedTrait': text
+ trait LocalTrait2 : DeprecatedTrait { } //~ WARN use of deprecated trait `lint_stability::DeprecatedTrait`: text
impl Trait for S {
fn trait_stable(&self) {}
@@ -206,7 +206,7 @@ mod inheritance {
stable_mod::unstable();
stable_mod::stable();
- unstable_mod::deprecated(); //~ WARN use of deprecated item 'inheritance::inherited_stability::unstable_mod::deprecated': text
+ unstable_mod::deprecated(); //~ WARN use of deprecated function `inheritance::inherited_stability::unstable_mod::deprecated`: text
unstable_mod::unstable();
let _ = Unstable::UnstableVariant;
@@ -328,23 +328,23 @@ mod this_crate {
type Foo = MethodTester;
let foo = MethodTester;
- deprecated(); //~ WARN use of deprecated item 'this_crate::deprecated'
- foo.method_deprecated(); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated'
- Foo::method_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated'
- ::method_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated'
- foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
-
- deprecated_text(); //~ WARN use of deprecated item 'this_crate::deprecated_text': text
- foo.method_deprecated_text(); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- Foo::method_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- ::method_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ deprecated(); //~ WARN use of deprecated function `this_crate::deprecated`
+ foo.method_deprecated(); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ Foo::method_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ ::method_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated`
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+
+ deprecated_text(); //~ WARN use of deprecated function `this_crate::deprecated_text`: text
+ foo.method_deprecated_text(); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ Foo::method_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ ::method_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
unstable();
foo.method_unstable();
@@ -383,34 +383,34 @@ mod this_crate {
::trait_stable_text(&foo);
let _ = DeprecatedStruct {
- //~^ WARN use of deprecated item 'this_crate::DeprecatedStruct'
- i: 0 //~ WARN use of deprecated item 'this_crate::DeprecatedStruct::i'
+ //~^ WARN use of deprecated struct `this_crate::DeprecatedStruct`
+ i: 0 //~ WARN use of deprecated field `this_crate::DeprecatedStruct::i`
};
let _ = UnstableStruct { i: 0 };
let _ = StableStruct { i: 0 };
- let _ = DeprecatedUnitStruct; //~ WARN use of deprecated item 'this_crate::DeprecatedUnitStruct'
+ let _ = DeprecatedUnitStruct; //~ WARN use of deprecated unit struct `this_crate::DeprecatedUnitStruct`
let _ = UnstableUnitStruct;
let _ = StableUnitStruct;
- let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated item 'this_crate::Enum::DeprecatedVariant'
+ let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated unit variant `this_crate::Enum::DeprecatedVariant`
let _ = Enum::UnstableVariant;
let _ = Enum::StableVariant;
- let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated item 'this_crate::DeprecatedTupleStruct'
+ let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated tuple struct `this_crate::DeprecatedTupleStruct`
let _ = UnstableTupleStruct (1);
let _ = StableTupleStruct (1);
}
fn test_method_param(foo: Foo) {
- foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
- ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ Trait::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ ::trait_deprecated(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
+ ::trait_deprecated_text(&foo); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
foo.trait_unstable();
Trait::trait_unstable(&foo);
::trait_unstable(&foo);
@@ -426,8 +426,8 @@ mod this_crate {
}
fn test_method_object(foo: &dyn Trait) {
- foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated'
- foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+ foo.trait_deprecated(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated`
+ foo.trait_deprecated_text(); //~ WARN use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
foo.trait_unstable();
foo.trait_unstable_text();
foo.trait_stable();
@@ -437,7 +437,7 @@ mod this_crate {
#[rustc_deprecated(since = "1.0.0", reason = "text")]
fn test_fn_body() {
fn fn_in_body() {}
- fn_in_body(); //~ WARN use of deprecated item 'this_crate::test_fn_body::fn_in_body': text
+ fn_in_body(); //~ WARN use of deprecated function `this_crate::test_fn_body::fn_in_body`: text
}
impl MethodTester {
@@ -445,7 +445,7 @@ mod this_crate {
#[rustc_deprecated(since = "1.0.0", reason = "text")]
fn test_method_body(&self) {
fn fn_in_body() {}
- fn_in_body(); //~ WARN use of deprecated item 'this_crate::MethodTester::test_method_body::fn_in_body': text
+ fn_in_body(); //~ WARN use of deprecated function `this_crate::MethodTester::test_method_body::fn_in_body`: text
}
}
@@ -457,9 +457,9 @@ mod this_crate {
struct S;
- impl DeprecatedTrait for S { } //~ WARN use of deprecated item 'this_crate::DeprecatedTrait'
+ impl DeprecatedTrait for S { } //~ WARN use of deprecated trait `this_crate::DeprecatedTrait`
- trait LocalTrait : DeprecatedTrait { } //~ WARN use of deprecated item 'this_crate::DeprecatedTrait'
+ trait LocalTrait : DeprecatedTrait { } //~ WARN use of deprecated trait `this_crate::DeprecatedTrait`
}
fn main() {}
diff --git a/src/test/ui/lint/lint-stability-deprecated.stderr b/src/test/ui/lint/lint-stability-deprecated.stderr
index 801e04a7f4f83..d8dd83b0d06bd 100644
--- a/src/test/ui/lint/lint-stability-deprecated.stderr
+++ b/src/test/ui/lint/lint-stability-deprecated.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'lint_stability::deprecated': text
+warning: use of deprecated function `lint_stability::deprecated`: text
--> $DIR/lint-stability-deprecated.rs:25:9
|
LL | deprecated();
@@ -10,643 +10,643 @@ note: the lint level is defined here
LL | #![warn(deprecated)]
| ^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:30:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:32:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_text': text
+warning: use of deprecated function `lint_stability::deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:34:9
|
LL | deprecated_text();
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:39:9
|
-LL | Trait::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:41:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_unstable': text
+warning: use of deprecated function `lint_stability::deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:43:9
|
LL | deprecated_unstable();
| ^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:48:9
|
-LL | Trait::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:50:9
|
-LL | ::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_unstable_text': text
+warning: use of deprecated function `lint_stability::deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:52:9
|
LL | deprecated_unstable_text();
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:57:9
|
LL | ... Trait::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:59:9
|
LL | ... ::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedStruct`: text
--> $DIR/lint-stability-deprecated.rs:109:17
|
LL | let _ = DeprecatedStruct {
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedUnstableStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedUnstableStruct`: text
--> $DIR/lint-stability-deprecated.rs:112:17
|
LL | let _ = DeprecatedUnstableStruct {
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedUnitStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedUnitStruct`: text
--> $DIR/lint-stability-deprecated.rs:119:17
|
LL | let _ = DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedUnstableUnitStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedUnstableUnitStruct`: text
--> $DIR/lint-stability-deprecated.rs:120:17
|
LL | let _ = DeprecatedUnstableUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Enum::DeprecatedVariant': text
+warning: use of deprecated variant `lint_stability::Enum::DeprecatedVariant`: text
--> $DIR/lint-stability-deprecated.rs:124:17
|
LL | let _ = Enum::DeprecatedVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Enum::DeprecatedUnstableVariant': text
+warning: use of deprecated variant `lint_stability::Enum::DeprecatedUnstableVariant`: text
--> $DIR/lint-stability-deprecated.rs:125:17
|
LL | let _ = Enum::DeprecatedUnstableVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedTupleStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedTupleStruct`: text
--> $DIR/lint-stability-deprecated.rs:129:17
|
LL | let _ = DeprecatedTupleStruct (1);
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedUnstableTupleStruct': text
+warning: use of deprecated struct `lint_stability::DeprecatedUnstableTupleStruct`: text
--> $DIR/lint-stability-deprecated.rs:130:17
|
LL | let _ = DeprecatedUnstableTupleStruct (1);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_text': text
+warning: use of deprecated function `lint_stability::deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:139:25
|
LL | macro_test_arg!(deprecated_text());
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_unstable_text': text
+warning: use of deprecated function `lint_stability::deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:140:25
|
LL | macro_test_arg!(deprecated_unstable_text());
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::deprecated_text': text
+warning: use of deprecated function `lint_stability::deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:141:41
|
LL | macro_test_arg!(macro_test_arg!(deprecated_text()));
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:146:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:148:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:150:9
|
-LL | Trait::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:152:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:154:9
|
-LL | Trait::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Trait::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:156:9
|
-LL | ::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:158:9
|
LL | ... Trait::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:160:9
|
LL | ... ::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedTrait': text
+warning: use of deprecated trait `lint_stability::DeprecatedTrait`: text
--> $DIR/lint-stability-deprecated.rs:188:10
|
LL | impl DeprecatedTrait for S {}
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedTrait': text
+warning: use of deprecated trait `lint_stability::DeprecatedTrait`: text
--> $DIR/lint-stability-deprecated.rs:190:25
|
LL | trait LocalTrait2 : DeprecatedTrait { }
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'inheritance::inherited_stability::unstable_mod::deprecated': text
+warning: use of deprecated function `inheritance::inherited_stability::unstable_mod::deprecated`: text
--> $DIR/lint-stability-deprecated.rs:209:9
|
LL | unstable_mod::deprecated();
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::deprecated': text
+warning: use of deprecated function `this_crate::deprecated`: text
--> $DIR/lint-stability-deprecated.rs:331:9
|
LL | deprecated();
| ^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:336:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:338:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::deprecated_text': text
+warning: use of deprecated function `this_crate::deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:340:9
|
LL | deprecated_text();
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:345:9
|
LL | Trait::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:347:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedStruct': text
+warning: use of deprecated struct `this_crate::DeprecatedStruct`: text
--> $DIR/lint-stability-deprecated.rs:385:17
|
LL | let _ = DeprecatedStruct {
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedUnitStruct': text
+warning: use of deprecated unit struct `this_crate::DeprecatedUnitStruct`: text
--> $DIR/lint-stability-deprecated.rs:392:17
|
LL | let _ = DeprecatedUnitStruct;
| ^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Enum::DeprecatedVariant': text
+warning: use of deprecated unit variant `this_crate::Enum::DeprecatedVariant`: text
--> $DIR/lint-stability-deprecated.rs:396:17
|
LL | let _ = Enum::DeprecatedVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedTupleStruct': text
+warning: use of deprecated tuple struct `this_crate::DeprecatedTupleStruct`: text
--> $DIR/lint-stability-deprecated.rs:400:17
|
LL | let _ = DeprecatedTupleStruct (1);
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:407:9
|
LL | Trait::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:409:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:411:9
|
LL | Trait::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:413:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::test_fn_body::fn_in_body': text
+warning: use of deprecated function `this_crate::test_fn_body::fn_in_body`: text
--> $DIR/lint-stability-deprecated.rs:440:9
|
LL | fn_in_body();
| ^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedTrait': text
+warning: use of deprecated trait `this_crate::DeprecatedTrait`: text
--> $DIR/lint-stability-deprecated.rs:460:10
|
LL | impl DeprecatedTrait for S { }
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedTrait': text
+warning: use of deprecated trait `this_crate::DeprecatedTrait`: text
--> $DIR/lint-stability-deprecated.rs:462:24
|
LL | trait LocalTrait : DeprecatedTrait { }
| ^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::test_method_body::fn_in_body': text
+warning: use of deprecated function `this_crate::MethodTester::test_method_body::fn_in_body`: text
--> $DIR/lint-stability-deprecated.rs:448:13
|
LL | fn_in_body();
| ^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+warning: use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
--> $DIR/lint-stability-deprecated.rs:98:48
|
LL | struct S2(T::TypeDeprecated);
| ^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+warning: use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
--> $DIR/lint-stability-deprecated.rs:103:13
|
LL | TypeDeprecated = u16,
| ^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:26:13
|
LL | foo.method_deprecated();
| ^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:27:9
|
LL | Foo::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:28:9
|
LL | ::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:29:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:31:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:35:13
|
-LL | foo.method_deprecated_text();
- | ^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.method_deprecated_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:36:9
|
-LL | Foo::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Foo::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:37:9
|
-LL | ::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:38:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:40:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:44:13
|
-LL | foo.method_deprecated_unstable();
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.method_deprecated_unstable();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:45:9
|
-LL | Foo::method_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Foo::method_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:46:9
|
-LL | ::method_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::method_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:47:13
|
LL | foo.trait_deprecated_unstable();
| ^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:49:9
|
-LL | ::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:53:13
|
LL | ... foo.method_deprecated_unstable_text();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:54:9
|
LL | ... Foo::method_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::MethodTester::method_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:55:9
|
LL | ... ::method_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:56:13
|
-LL | foo.trait_deprecated_unstable_text();
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.trait_deprecated_unstable_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:58:9
|
LL | ... ::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedStruct::i': text
+warning: use of deprecated field `lint_stability::DeprecatedStruct::i`: text
--> $DIR/lint-stability-deprecated.rs:110:13
|
LL | i: 0
| ^^^^
-warning: use of deprecated item 'lint_stability::DeprecatedUnstableStruct::i': text
+warning: use of deprecated field `lint_stability::DeprecatedUnstableStruct::i`: text
--> $DIR/lint-stability-deprecated.rs:114:13
|
LL | i: 0
| ^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:145:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:147:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:149:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:151:9
|
-LL | ::trait_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:153:13
|
LL | foo.trait_deprecated_unstable();
| ^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:155:9
|
-LL | ::trait_deprecated_unstable(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::trait_deprecated_unstable(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:157:13
|
-LL | foo.trait_deprecated_unstable_text();
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.trait_deprecated_unstable_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:159:9
|
LL | ... ::trait_deprecated_unstable_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:176:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:177:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable`: text
--> $DIR/lint-stability-deprecated.rs:178:13
|
LL | foo.trait_deprecated_unstable();
| ^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text
+warning: use of deprecated associated function `lint_stability::Trait::trait_deprecated_unstable_text`: text
--> $DIR/lint-stability-deprecated.rs:179:13
|
-LL | foo.trait_deprecated_unstable_text();
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.trait_deprecated_unstable_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:332:13
|
LL | foo.method_deprecated();
| ^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:333:9
|
LL | Foo::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:334:9
|
LL | ::method_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:335:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:337:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:341:13
|
-LL | foo.method_deprecated_text();
- | ^^^^^^^^^^^^^^^^^^^^^^
+LL | ... foo.method_deprecated_text();
+ | ^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:342:9
|
-LL | Foo::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... Foo::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text
+warning: use of deprecated associated function `this_crate::MethodTester::method_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:343:9
|
-LL | ::method_deprecated_text(&foo);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | ... ::method_deprecated_text(&foo);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:344:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:346:9
|
LL | ::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::DeprecatedStruct::i': text
+warning: use of deprecated field `this_crate::DeprecatedStruct::i`: text
--> $DIR/lint-stability-deprecated.rs:387:13
|
LL | i: 0
| ^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:406:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:408:9
|
LL | ::trait_deprecated(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:410:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:412:9
|
LL | ::trait_deprecated_text(&foo);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated`: text
--> $DIR/lint-stability-deprecated.rs:429:13
|
LL | foo.trait_deprecated();
| ^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text
+warning: use of deprecated associated function `this_crate::Trait::trait_deprecated_text`: text
--> $DIR/lint-stability-deprecated.rs:430:13
|
LL | foo.trait_deprecated_text();
| ^^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+warning: use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
--> $DIR/lint-stability-deprecated.rs:98:48
|
LL | struct S2(T::TypeDeprecated);
| ^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+warning: use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
--> $DIR/lint-stability-deprecated.rs:103:13
|
LL | TypeDeprecated = u16,
| ^^^^^^^^^^^^^^^^^^^^
-warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text
+warning: use of deprecated associated type `lint_stability::TraitWithAssociatedTypes::TypeDeprecated`: text
--> $DIR/lint-stability-deprecated.rs:103:13
|
LL | TypeDeprecated = u16,
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.rs b/src/test/ui/lint/lint-stability-fields-deprecated.rs
index 50e3970c7f0d4..14c6383806fb8 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.rs
+++ b/src/test/ui/lint/lint-stability-fields-deprecated.rs
@@ -16,19 +16,19 @@ mod cross_crate {
inherit: 1,
override1: 2,
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
let _ = x.override1;
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Stable {
inherit: _,
override1: _,
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
// all fine
let Stable { .. } = x;
@@ -38,12 +38,12 @@ mod cross_crate {
let _ = x.0;
let _ = x.1;
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Stable2(_,
_,
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
// all fine
let Stable2(..) = x;
@@ -53,19 +53,19 @@ mod cross_crate {
inherit: 1,
override1: 2,
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
let _ = x.override1;
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Unstable {
inherit: _,
override1: _,
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
let Unstable
@@ -78,13 +78,13 @@ mod cross_crate {
let _ = x.0;
let _ = x.1;
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Unstable2
(_,
_,
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
let Unstable2
// the patterns are all fine:
@@ -92,58 +92,58 @@ mod cross_crate {
let x = Deprecated {
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
inherit: 1,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override1: 2,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.override1;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Deprecated {
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
inherit: _,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override1: _,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
let Deprecated
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
// the patterns are all fine:
{ .. } = x;
let x = Deprecated2(1, 2, 3);
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
let _ = x.0;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.1;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Deprecated2
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
(_,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
_,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
let Deprecated2
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
// the patterns are all fine:
(..) = x;
}
@@ -203,19 +203,19 @@ mod this_crate {
inherit: 1,
override1: 2,
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
let _ = x.override1;
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Stable {
inherit: _,
override1: _,
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
// all fine
let Stable { .. } = x;
@@ -225,12 +225,12 @@ mod this_crate {
let _ = x.0;
let _ = x.1;
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Stable2(_,
_,
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
// all fine
let Stable2(..) = x;
@@ -240,19 +240,19 @@ mod this_crate {
inherit: 1,
override1: 2,
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
let _ = x.override1;
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Unstable {
inherit: _,
override1: _,
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
let Unstable
@@ -265,13 +265,13 @@ mod this_crate {
let _ = x.0;
let _ = x.1;
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Unstable2
(_,
_,
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
let Unstable2
// the patterns are all fine:
@@ -279,58 +279,58 @@ mod this_crate {
let x = Deprecated {
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
inherit: 1,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override1: 2,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override2: 3,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
};
let _ = x.inherit;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.override1;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.override2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Deprecated {
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
inherit: _,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override1: _,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
override2: _
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
} = x;
let Deprecated
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated struct
// the patterns are all fine:
{ .. } = x;
let x = Deprecated2(1, 2, 3);
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated tuple struct
let _ = x.0;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.1;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let _ = x.2;
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
let Deprecated2
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated tuple struct
(_,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
_,
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
_)
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated field
= x;
let Deprecated2
- //~^ ERROR use of deprecated item
+ //~^ ERROR use of deprecated tuple struct
// the patterns are all fine:
(..) = x;
}
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.stderr b/src/test/ui/lint/lint-stability-fields-deprecated.stderr
index 5210fb690e9d7..ec786786023b9 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.stderr
+++ b/src/test/ui/lint/lint-stability-fields-deprecated.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:94:17
|
LL | let x = Deprecated {
@@ -10,367 +10,367 @@ note: the lint level is defined here
LL | #![deny(deprecated)]
| ^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:111:13
|
LL | let Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:121:13
|
LL | let Deprecated
| ^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:126:17
|
LL | let x = Deprecated2(1, 2, 3);
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:136:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text
+error: use of deprecated struct `cross_crate::lint_stability_fields::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:145:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated': text
+error: use of deprecated struct `this_crate::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:281:17
|
LL | let x = Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated': text
+error: use of deprecated struct `this_crate::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:298:13
|
LL | let Deprecated {
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated': text
+error: use of deprecated struct `this_crate::Deprecated`: text
--> $DIR/lint-stability-fields-deprecated.rs:308:13
|
LL | let Deprecated
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated2': text
+error: use of deprecated tuple struct `this_crate::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:313:17
|
LL | let x = Deprecated2(1, 2, 3);
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated2': text
+error: use of deprecated tuple struct `this_crate::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:323:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated2': text
+error: use of deprecated tuple struct `this_crate::Deprecated2`: text
--> $DIR/lint-stability-fields-deprecated.rs:332:13
|
LL | let Deprecated2
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:18:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:24:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:30:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Stable2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Stable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:40:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Stable2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Stable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:45:20
|
LL | _)
| ^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:55:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:61:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:67:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Unstable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:80:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Unstable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:86:14
|
LL | _)
| ^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:96:13
|
LL | inherit: 1,
| ^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:98:13
|
LL | override1: 2,
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:100:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:104:17
|
LL | let _ = x.inherit;
| ^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:106:17
|
LL | let _ = x.override1;
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:108:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:113:13
|
LL | inherit: _,
| ^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:115:13
|
LL | override1: _,
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:117:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::0': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::0`: text
--> $DIR/lint-stability-fields-deprecated.rs:129:17
|
LL | let _ = x.0;
| ^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::1': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::1`: text
--> $DIR/lint-stability-fields-deprecated.rs:131:17
|
LL | let _ = x.1;
| ^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:133:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::0': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::0`: text
--> $DIR/lint-stability-fields-deprecated.rs:138:14
|
LL | (_,
| ^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::1': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::1`: text
--> $DIR/lint-stability-fields-deprecated.rs:140:14
|
LL | _,
| ^
-error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::2': text
+error: use of deprecated field `cross_crate::lint_stability_fields::Deprecated2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:142:14
|
LL | _)
| ^
-error: use of deprecated item 'this_crate::Stable::override2': text
+error: use of deprecated field `this_crate::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:205:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Stable::override2': text
+error: use of deprecated field `this_crate::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:211:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Stable::override2': text
+error: use of deprecated field `this_crate::Stable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:217:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Stable2::2': text
+error: use of deprecated field `this_crate::Stable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:227:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'this_crate::Stable2::2': text
+error: use of deprecated field `this_crate::Stable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:232:20
|
LL | _)
| ^
-error: use of deprecated item 'this_crate::Unstable::override2': text
+error: use of deprecated field `this_crate::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:242:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Unstable::override2': text
+error: use of deprecated field `this_crate::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:248:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Unstable::override2': text
+error: use of deprecated field `this_crate::Unstable::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:254:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Unstable2::2': text
+error: use of deprecated field `this_crate::Unstable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:267:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'this_crate::Unstable2::2': text
+error: use of deprecated field `this_crate::Unstable2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:273:14
|
LL | _)
| ^
-error: use of deprecated item 'this_crate::Deprecated::inherit': text
+error: use of deprecated field `this_crate::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:283:13
|
LL | inherit: 1,
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override1': text
+error: use of deprecated field `this_crate::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:285:13
|
LL | override1: 2,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override2': text
+error: use of deprecated field `this_crate::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:287:13
|
LL | override2: 3,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::inherit': text
+error: use of deprecated field `this_crate::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:291:17
|
LL | let _ = x.inherit;
| ^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override1': text
+error: use of deprecated field `this_crate::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:293:17
|
LL | let _ = x.override1;
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override2': text
+error: use of deprecated field `this_crate::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:295:17
|
LL | let _ = x.override2;
| ^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::inherit': text
+error: use of deprecated field `this_crate::Deprecated::inherit`: text
--> $DIR/lint-stability-fields-deprecated.rs:300:13
|
LL | inherit: _,
| ^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override1': text
+error: use of deprecated field `this_crate::Deprecated::override1`: text
--> $DIR/lint-stability-fields-deprecated.rs:302:13
|
LL | override1: _,
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated::override2': text
+error: use of deprecated field `this_crate::Deprecated::override2`: text
--> $DIR/lint-stability-fields-deprecated.rs:304:13
|
LL | override2: _
| ^^^^^^^^^^^^
-error: use of deprecated item 'this_crate::Deprecated2::0': text
+error: use of deprecated field `this_crate::Deprecated2::0`: text
--> $DIR/lint-stability-fields-deprecated.rs:316:17
|
LL | let _ = x.0;
| ^^^
-error: use of deprecated item 'this_crate::Deprecated2::1': text
+error: use of deprecated field `this_crate::Deprecated2::1`: text
--> $DIR/lint-stability-fields-deprecated.rs:318:17
|
LL | let _ = x.1;
| ^^^
-error: use of deprecated item 'this_crate::Deprecated2::2': text
+error: use of deprecated field `this_crate::Deprecated2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:320:17
|
LL | let _ = x.2;
| ^^^
-error: use of deprecated item 'this_crate::Deprecated2::0': text
+error: use of deprecated field `this_crate::Deprecated2::0`: text
--> $DIR/lint-stability-fields-deprecated.rs:325:14
|
LL | (_,
| ^
-error: use of deprecated item 'this_crate::Deprecated2::1': text
+error: use of deprecated field `this_crate::Deprecated2::1`: text
--> $DIR/lint-stability-fields-deprecated.rs:327:14
|
LL | _,
| ^
-error: use of deprecated item 'this_crate::Deprecated2::2': text
+error: use of deprecated field `this_crate::Deprecated2::2`: text
--> $DIR/lint-stability-fields-deprecated.rs:329:14
|
LL | _)
diff --git a/src/test/ui/lint/lint-stability2.rs b/src/test/ui/lint/lint-stability2.rs
index 9710d0826c71f..9ae23dac61bef 100644
--- a/src/test/ui/lint/lint-stability2.rs
+++ b/src/test/ui/lint/lint-stability2.rs
@@ -1,5 +1,5 @@
// aux-build:lint_stability.rs
-// error-pattern: use of deprecated item
+// error-pattern: use of deprecated function
#![deny(deprecated)]
diff --git a/src/test/ui/lint/lint-stability2.stderr b/src/test/ui/lint/lint-stability2.stderr
index a14bf2ec8ca97..036304d25f9bf 100644
--- a/src/test/ui/lint/lint-stability2.stderr
+++ b/src/test/ui/lint/lint-stability2.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'lint_stability::deprecated': text
+error: use of deprecated function `lint_stability::deprecated`: text
--> $DIR/lint-stability2.rs:12:5
|
LL | macro_test!();
diff --git a/src/test/ui/lint/lint-stability3.rs b/src/test/ui/lint/lint-stability3.rs
index 3d2cc6890b812..4452846ec0a96 100644
--- a/src/test/ui/lint/lint-stability3.rs
+++ b/src/test/ui/lint/lint-stability3.rs
@@ -1,5 +1,5 @@
// aux-build:lint_stability.rs
-// error-pattern: use of deprecated item
+// error-pattern: use of deprecated function
#![deny(deprecated)]
#![allow(warnings)]
diff --git a/src/test/ui/lint/lint-stability3.stderr b/src/test/ui/lint/lint-stability3.stderr
index 858ac12612c69..b89a7df493877 100644
--- a/src/test/ui/lint/lint-stability3.stderr
+++ b/src/test/ui/lint/lint-stability3.stderr
@@ -1,4 +1,4 @@
-error: use of deprecated item 'lint_stability::deprecated_text': text
+error: use of deprecated function `lint_stability::deprecated_text`: text
--> $DIR/lint-stability3.rs:13:5
|
LL | macro_test_arg_nested!(deprecated_text);
diff --git a/src/test/ui/logging-only-prints-once.rs b/src/test/ui/logging-only-prints-once.rs
index 6b49c441d1eae..6d16819ceb0f0 100644
--- a/src/test/ui/logging-only-prints-once.rs
+++ b/src/test/ui/logging-only-prints-once.rs
@@ -1,7 +1,6 @@
// run-pass
// ignore-windows
// ignore-emscripten no threads support
-// exec-env:RUSTC_LOG=debug
use std::cell::Cell;
use std::fmt;
@@ -19,10 +18,13 @@ impl fmt::Debug for Foo {
}
pub fn main() {
- thread::spawn(move|| {
+ thread::spawn(move || {
let mut f = Foo(Cell::new(0));
println!("{:?}", f);
let Foo(ref mut f) = f;
assert_eq!(f.get(), 1);
- }).join().ok().unwrap();
+ })
+ .join()
+ .ok()
+ .unwrap();
}
diff --git a/src/test/ui/logging_before_rt_started.rs b/src/test/ui/logging_before_rt_started.rs
deleted file mode 100644
index 540d2b4f58a90..0000000000000
--- a/src/test/ui/logging_before_rt_started.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-// exec-env:RUSTC_LOG=std::ptr
-
-// In issue #9487, it was realized that std::ptr was invoking the logging
-// infrastructure, and when std::ptr was used during runtime initialization,
-// this caused some serious problems. The problems have since been fixed, but
-// this test will trigger "output during runtime initialization" to make sure
-// that the bug isn't re-introduced.
-
-// pretty-expanded FIXME #23616
-
-pub fn main() {}
diff --git a/src/test/ui/macros/macro-deprecation.rs b/src/test/ui/macros/macro-deprecation.rs
index 9636b48c2daa3..a7f327cf53b1e 100644
--- a/src/test/ui/macros/macro-deprecation.rs
+++ b/src/test/ui/macros/macro-deprecation.rs
@@ -8,6 +8,6 @@
macro_rules! local_deprecated{ () => () }
fn main() {
- local_deprecated!(); //~ WARN use of deprecated item 'local_deprecated': local deprecation note
- deprecated_macro!(); //~ WARN use of deprecated item 'deprecated_macro': deprecation note
+ local_deprecated!(); //~ WARN use of deprecated macro `local_deprecated`: local deprecation note
+ deprecated_macro!(); //~ WARN use of deprecated macro `deprecated_macro`: deprecation note
}
diff --git a/src/test/ui/macros/macro-deprecation.stderr b/src/test/ui/macros/macro-deprecation.stderr
index 0e8ecb58fe588..07849d7ce5778 100644
--- a/src/test/ui/macros/macro-deprecation.stderr
+++ b/src/test/ui/macros/macro-deprecation.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'local_deprecated': local deprecation note
+warning: use of deprecated macro `local_deprecated`: local deprecation note
--> $DIR/macro-deprecation.rs:11:5
|
LL | local_deprecated!();
@@ -6,7 +6,7 @@ LL | local_deprecated!();
|
= note: `#[warn(deprecated)]` on by default
-warning: use of deprecated item 'deprecated_macro': deprecation note
+warning: use of deprecated macro `deprecated_macro`: deprecation note
--> $DIR/macro-deprecation.rs:12:5
|
LL | deprecated_macro!();
diff --git a/src/test/ui/macros/macro-stability.rs b/src/test/ui/macros/macro-stability.rs
index 755f55c28de47..e2eff7c1c2d6c 100644
--- a/src/test/ui/macros/macro-stability.rs
+++ b/src/test/ui/macros/macro-stability.rs
@@ -22,7 +22,7 @@ fn main() {
// unstable_macro_modern!(); // ERROR use of unstable library feature 'unstable_macros'
deprecated_macro!();
- //~^ WARN use of deprecated item 'deprecated_macro': deprecation reason
+ //~^ WARN use of deprecated macro `deprecated_macro`: deprecation reason
local_deprecated!();
- //~^ WARN use of deprecated item 'local_deprecated': local deprecation reason
+ //~^ WARN use of deprecated macro `local_deprecated`: local deprecation reason
}
diff --git a/src/test/ui/macros/macro-stability.stderr b/src/test/ui/macros/macro-stability.stderr
index 9e127a3b8559b..34b62b4b1c3fd 100644
--- a/src/test/ui/macros/macro-stability.stderr
+++ b/src/test/ui/macros/macro-stability.stderr
@@ -22,7 +22,7 @@ LL | unstable_macro!();
|
= help: add `#![feature(unstable_macros)]` to the crate attributes to enable
-warning: use of deprecated item 'deprecated_macro': deprecation reason
+warning: use of deprecated macro `deprecated_macro`: deprecation reason
--> $DIR/macro-stability.rs:24:5
|
LL | deprecated_macro!();
@@ -30,7 +30,7 @@ LL | deprecated_macro!();
|
= note: `#[warn(deprecated)]` on by default
-warning: use of deprecated item 'local_deprecated': local deprecation reason
+warning: use of deprecated macro `local_deprecated`: local deprecation reason
--> $DIR/macro-stability.rs:26:5
|
LL | local_deprecated!();
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.rs b/src/test/ui/mismatched_types/const-fn-in-trait.rs
index 7fcbd7e7e8bb2..3b1992d90b7c5 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.rs
+++ b/src/test/ui/mismatched_types/const-fn-in-trait.rs
@@ -1,5 +1,3 @@
-// rustc-env:RUST_NEW_ERROR_FORMAT
-
#![feature(const_fn)]
trait Foo {
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
index 817582df27db1..450981a9183a2 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr
+++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
@@ -1,11 +1,11 @@
error[E0379]: functions in traits cannot be declared const
- --> $DIR/const-fn-in-trait.rs:7:5
+ --> $DIR/const-fn-in-trait.rs:5:5
|
LL | const fn g();
| ^^^^^ functions in traits cannot be const
error[E0379]: functions in traits cannot be declared const
- --> $DIR/const-fn-in-trait.rs:11:5
+ --> $DIR/const-fn-in-trait.rs:9:5
|
LL | const fn f() -> u32 { 22 }
| ^^^^^ functions in traits cannot be const
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs
index 949f5683c8a20..ba206b8608f6c 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs
+++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs
@@ -1,5 +1,3 @@
-// rustc-env:RUST_NEW_ERROR_FORMAT
-
trait Foo {
fn foo(x: u16);
fn bar(&mut self, bar: &mut Bar);
diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
index b20fddb05acf1..5735120f7104a 100644
--- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
+++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr
@@ -1,5 +1,5 @@
error[E0053]: method `foo` has an incompatible type for trait
- --> $DIR/trait-impl-fn-incompatibility.rs:11:15
+ --> $DIR/trait-impl-fn-incompatibility.rs:9:15
|
LL | fn foo(x: u16);
| --- type in trait
@@ -11,7 +11,7 @@ LL | fn foo(x: i16) { }
found fn pointer `fn(i16)`
error[E0053]: method `bar` has an incompatible type for trait
- --> $DIR/trait-impl-fn-incompatibility.rs:12:28
+ --> $DIR/trait-impl-fn-incompatibility.rs:10:28
|
LL | fn bar(&mut self, bar: &mut Bar);
| -------- type in trait
diff --git a/src/test/ui/proc-macro/attributes-on-definitions.rs b/src/test/ui/proc-macro/attributes-on-definitions.rs
index 055781d2c6048..c0733c8b416be 100644
--- a/src/test/ui/proc-macro/attributes-on-definitions.rs
+++ b/src/test/ui/proc-macro/attributes-on-definitions.rs
@@ -6,7 +6,7 @@
extern crate attributes_on_definitions;
attributes_on_definitions::with_attrs!();
-//~^ WARN use of deprecated item
+//~^ WARN use of deprecated
// No errors about the use of unstable and unsafe code inside the macro.
fn main() {}
diff --git a/src/test/ui/proc-macro/attributes-on-definitions.stderr b/src/test/ui/proc-macro/attributes-on-definitions.stderr
index 3e6b8f6a435d8..c63dd00119aca 100644
--- a/src/test/ui/proc-macro/attributes-on-definitions.stderr
+++ b/src/test/ui/proc-macro/attributes-on-definitions.stderr
@@ -1,4 +1,4 @@
-warning: use of deprecated item 'attributes_on_definitions::with_attrs': test
+warning: use of deprecated macro `attributes_on_definitions::with_attrs`: test
--> $DIR/attributes-on-definitions.rs:8:1
|
LL | attributes_on_definitions::with_attrs!();
diff --git a/src/test/ui/threads-sendsync/spawning-with-debug.rs b/src/test/ui/threads-sendsync/spawning-with-debug.rs
index 388d62aa7101c..9d3487ffb2956 100644
--- a/src/test/ui/threads-sendsync/spawning-with-debug.rs
+++ b/src/test/ui/threads-sendsync/spawning-with-debug.rs
@@ -2,7 +2,7 @@
#![allow(unused_must_use)]
#![allow(unused_mut)]
// ignore-windows
-// exec-env:RUSTC_LOG=debug
+// exec-env:RUST_LOG=debug
// ignore-emscripten no threads support
// regression test for issue #10405, make sure we don't call println! too soon.
@@ -11,5 +11,5 @@ use std::thread::Builder;
pub fn main() {
let mut t = Builder::new();
- t.spawn(move|| ());
+ t.spawn(move || ());
}
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 21fb7673ce061..653e1f13c4b48 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -623,7 +623,7 @@ impl<'test> TestCx<'test> {
.arg("-L")
.arg(&aux_dir)
.args(&self.props.compile_flags)
- .envs(self.props.exec_env.clone());
+ .envs(self.props.rustc_env.clone());
self.maybe_add_external_args(
&mut rustc,
self.split_maybe_args(&self.config.target_rustcflags),