about summary refs log tree commit diff
diff options
context:
space:
mode:
authorluoyangze.ptrl <luoyangze.ptrl@bytedance.com>2023-11-02 10:14:54 +0800
committerluoyangze.ptrl <luoyangze.ptrl@bytedance.com>2023-11-02 10:14:54 +0800
commitb76f2c8ee0d9bc5517e6d8a01d62f1add8b12c35 (patch)
tree5672ff4e900836f15899cbd9fc1a4b2dc16bc642
parent740a864b7cd7b3f0981f2562519483b0350550a5 (diff)
downloadrust-b76f2c8ee0d9bc5517e6d8a01d62f1add8b12c35.tar.gz
rust-b76f2c8ee0d9bc5517e6d8a01d62f1add8b12c35.zip
fix: using name(include) instead of str
-rw-r--r--crates/hir-expand/src/db.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs
index 80450afc331..204227e3387 100644
--- a/crates/hir-expand/src/db.rs
+++ b/crates/hir-expand/src/db.rs
@@ -12,11 +12,15 @@ use syntax::{
 use triomphe::Arc;
 
 use crate::{
-    ast_id_map::AstIdMap, builtin_attr_macro::pseudo_derive_attr_expansion,
-    builtin_fn_macro::EagerExpander, fixup, hygiene::HygieneFrame, tt, AstId, BuiltinAttrExpander,
-    BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallInfo, ExpandError, ExpandResult,
-    ExpandTo, HirFileId, HirFileIdRepr, MacroCallId, MacroCallKind, MacroCallLoc, MacroDefId,
-    MacroDefKind, MacroFile, ProcMacroExpander,
+    ast_id_map::AstIdMap,
+    builtin_attr_macro::pseudo_derive_attr_expansion,
+    builtin_fn_macro::EagerExpander,
+    fixup,
+    hygiene::HygieneFrame,
+    name::{name, AsName},
+    tt, AstId, BuiltinAttrExpander, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallInfo,
+    ExpandError, ExpandResult, ExpandTo, HirFileId, HirFileIdRepr, MacroCallId, MacroCallKind,
+    MacroCallLoc, MacroDefId, MacroDefKind, MacroFile, ProcMacroExpander,
 };
 
 /// Total limit on the number of tokens produced by any macro invocation.
@@ -620,7 +624,7 @@ fn macro_expand(db: &dyn ExpandDatabase, id: MacroCallId) -> ExpandResult<Arc<tt
             if let Some(name_ref) =
                 ast_id.to_node(db).path().and_then(|p| p.segment()).and_then(|s| s.name_ref())
             {
-                name_ref.text() == "include"
+                name_ref.as_name() == name!(include)
             } else {
                 false
             }