bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/cfg/src/cfg_expr.rs')
-rw-r--r--crates/cfg/src/cfg_expr.rs39
1 files changed, 22 insertions, 17 deletions
diff --git a/crates/cfg/src/cfg_expr.rs b/crates/cfg/src/cfg_expr.rs
index 9c95f0e4e4..e4c2a28fb0 100644
--- a/crates/cfg/src/cfg_expr.rs
+++ b/crates/cfg/src/cfg_expr.rs
@@ -2,20 +2,20 @@
//!
//! See: <https://doc.rust-lang.org/reference/conditional-compilation.html#conditional-compilation>
-use std::{fmt, slice::Iter as SliceIter};
+use std::fmt;
-use smol_str::SmolStr;
+use intern::Symbol;
/// A simple configuration value passed in from the outside.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum CfgAtom {
/// eg. `#[cfg(test)]`
- Flag(SmolStr),
+ Flag(Symbol),
/// eg. `#[cfg(target_os = "linux")]`
///
/// Note that a key can have multiple values that are all considered "active" at the same time.
/// For example, `#[cfg(target_feature = "sse")]` and `#[cfg(target_feature = "sse2")]`.
- KeyValue { key: SmolStr, value: SmolStr },
+ KeyValue { key: Symbol, value: Symbol },
}
impl fmt::Display for CfgAtom {
@@ -44,6 +44,7 @@ impl From<CfgAtom> for CfgExpr {
}
impl CfgExpr {
+ #[cfg(feature = "tt")]
pub fn parse<S>(tt: &tt::Subtree<S>) -> CfgExpr {
next_cfg_expr(&mut tt.token_trees.iter()).unwrap_or(CfgExpr::Invalid)
}
@@ -63,7 +64,11 @@ impl CfgExpr {
}
}
}
-fn next_cfg_expr<S>(it: &mut SliceIter<'_, tt::TokenTree<S>>) -> Option<CfgExpr> {
+
+#[cfg(feature = "tt")]
+fn next_cfg_expr<S>(it: &mut std::slice::Iter<'_, tt::TokenTree<S>>) -> Option<CfgExpr> {
+ use intern::sym;
+
let name = match it.next() {
None => return None,
Some(tt::TokenTree::Leaf(tt::Leaf::Ident(ident))) => ident.sym.clone(),
@@ -77,9 +82,7 @@ fn next_cfg_expr<S>(it: &mut SliceIter<'_, tt::TokenTree<S>>) -> Option<CfgExpr>
Some(tt::TokenTree::Leaf(tt::Leaf::Literal(literal))) => {
it.next();
it.next();
- // FIXME: escape?
- let value = literal.symbol.as_str().into();
- CfgAtom::KeyValue { key: name.as_str().into(), value }.into()
+ CfgAtom::KeyValue { key: name, value: literal.symbol.clone() }.into()
}
_ => return Some(CfgExpr::Invalid),
}
@@ -88,14 +91,16 @@ fn next_cfg_expr<S>(it: &mut SliceIter<'_, tt::TokenTree<S>>) -> Option<CfgExpr>
it.next();
let mut sub_it = subtree.token_trees.iter();
let mut subs = std::iter::from_fn(|| next_cfg_expr(&mut sub_it)).collect();
- match name.as_str() {
- "all" => CfgExpr::All(subs),
- "any" => CfgExpr::Any(subs),
- "not" => CfgExpr::Not(Box::new(subs.pop().unwrap_or(CfgExpr::Invalid))),
+ match &name {
+ s if *s == sym::all => CfgExpr::All(subs),
+ s if *s == sym::any => CfgExpr::Any(subs),
+ s if *s == sym::not => {
+ CfgExpr::Not(Box::new(subs.pop().unwrap_or(CfgExpr::Invalid)))
+ }
_ => CfgExpr::Invalid,
}
}
- _ => CfgAtom::Flag(name.as_str().into()).into(),
+ _ => CfgAtom::Flag(name).into(),
};
// Eat comma separator
@@ -111,11 +116,11 @@ fn next_cfg_expr<S>(it: &mut SliceIter<'_, tt::TokenTree<S>>) -> Option<CfgExpr>
impl arbitrary::Arbitrary<'_> for CfgAtom {
fn arbitrary(u: &mut arbitrary::Unstructured<'_>) -> arbitrary::Result<Self> {
if u.arbitrary()? {
- Ok(CfgAtom::Flag(String::arbitrary(u)?.into()))
+ Ok(CfgAtom::Flag(Symbol::intern(<_>::arbitrary(u)?)))
} else {
Ok(CfgAtom::KeyValue {
- key: String::arbitrary(u)?.into(),
- value: String::arbitrary(u)?.into(),
+ key: Symbol::intern(<_>::arbitrary(u)?),
+ value: Symbol::intern(<_>::arbitrary(u)?),
})
}
}