about summary refs log tree commit diff
path: root/compiler/rustc_span/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-01-28 15:09:08 +0900
committerGitHub <noreply@github.com>2021-01-28 15:09:08 +0900
commit70be5cef699d5dcbe9457f4def66055a9ef6b966 (patch)
treecba5a1432773caf49f64dbb34093cf2377b4cf41 /compiler/rustc_span/src
parent84ad95be70d3a1b06ed537e4e7ec0c8e1086cb36 (diff)
parente25959b417fe2a08d808f9ddc737c2c9742d6d6a (diff)
downloadrust-70be5cef699d5dcbe9457f4def66055a9ef6b966.tar.gz
rust-70be5cef699d5dcbe9457f4def66055a9ef6b966.zip
Rollup merge of #81277 - flip1995:from_diag_items, r=matthewjasper
Make more traits of the From/Into family diagnostic items

Following traits are now diagnostic items:
- `From` (unchanged)
- `Into`
- `TryFrom`
- `TryInto`

This also adds symbols for those items:
- `into_trait`
- `try_from_trait`
- `try_into_trait`

Related: https://github.com/rust-lang/rust-clippy/pull/6620#discussion_r562482587
Diffstat (limited to 'compiler/rustc_span/src')
-rw-r--r--compiler/rustc_span/src/symbol.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
index 7b90e5b611c..2e7c9701c0c 100644
--- a/compiler/rustc_span/src/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
@@ -622,6 +622,7 @@ symbols! {
         intel,
         into_iter,
         into_result,
+        into_trait,
         intra_doc_pointers,
         intrinsics,
         irrefutable_let_patterns,
@@ -1159,6 +1160,8 @@ symbols! {
         truncf32,
         truncf64,
         try_blocks,
+        try_from_trait,
+        try_into_trait,
         try_trait,
         tt,
         tuple,