Revert "Auto merge of #12149 - jonas-schievink:literally-just-a-literal, r=jonas-schievink"

This reverts commit cc9ae2b89e, reversing
changes made to 7dfd1cb572.

crates/syntax/src/ast/expr_ext.rs

@@ -8,7 +8,7 @@ use crate::{
         operators::{ArithOp, BinaryOp, CmpOp, LogicOp, Ordering, RangeOp, UnaryOp},
         support, AstChildren, AstNode,
     },
-    AstToken, SyntaxElement,
+    AstToken,
     SyntaxKind::*,
     SyntaxNode, SyntaxToken, T,
 };
@@ -282,32 +282,30 @@ pub enum LiteralKind {
     String(ast::String),
     ByteString(ast::ByteString),
     IntNumber(ast::IntNumber),
-    FloatNumber(ast::FloatLiteral),
+    FloatNumber(ast::FloatNumber),
     Char(ast::Char),
     Byte(ast::Byte),
     Bool(bool),
 }
 
 impl ast::Literal {
-    pub fn value(&self) -> SyntaxElement {
+    pub fn token(&self) -> SyntaxToken {
         self.syntax()
             .children_with_tokens()
             .find(|e| e.kind() != ATTR && !e.kind().is_trivia())
+            .and_then(|e| e.into_token())
             .unwrap()
     }
+
     pub fn kind(&self) -> LiteralKind {
-        let token = match self.value() {
-            rowan::NodeOrToken::Node(node) => {
-                return LiteralKind::FloatNumber(
-                    ast::FloatLiteral::cast(node).expect("unreachable"),
-                );
-            }
-            rowan::NodeOrToken::Token(token) => token,
-        };
+        let token = self.token();
 
         if let Some(t) = ast::IntNumber::cast(token.clone()) {
             return LiteralKind::IntNumber(t);
         }
+        if let Some(t) = ast::FloatNumber::cast(token.clone()) {
+            return LiteralKind::FloatNumber(t);
+        }
         if let Some(t) = ast::String::cast(token.clone()) {
             return LiteralKind::String(t);
         }
@@ -327,26 +325,6 @@ impl ast::Literal {
             _ => unreachable!(),
         }
     }
-
-    pub fn as_string(&self) -> Option<ast::String> {
-        match self.kind() {
-            LiteralKind::String(it) => Some(it),
-            _ => None,
-        }
-    }
-
-    pub fn as_byte_string(&self) -> Option<ast::ByteString> {
-        match self.kind() {
-            LiteralKind::ByteString(it) => Some(it),
-            _ => None,
-        }
-    }
-}
-
-impl ast::FloatLiteral {
-    pub fn suffix(&self) -> Option<String> {
-        ast::FloatNumberPart::cast(self.syntax().last_token()?)?.suffix().map(|s| s.to_string())
-    }
 }
 
 pub enum BlockModifier {
@@ -386,7 +364,7 @@ impl ast::BlockExpr {
 fn test_literal_with_attr() {
     let parse = ast::SourceFile::parse(r#"const _: &str = { #[attr] "Hello" };"#);
     let lit = parse.tree().syntax().descendants().find_map(ast::Literal::cast).unwrap();
-    assert_eq!(lit.value().to_string(), r#""Hello""#);
+    assert_eq!(lit.token().text(), r#""Hello""#);
 }
 
 impl ast::RecordExprField {