@@ -456,7 +456,7 @@ impl<'a> DFParser<'a> {
456456 break ;
457457 }
458458 if expecting_statement_delimiter {
459- return self . expected ( "end of statement" , self . parser . peek_token ( ) ) ;
459+ return self . expected ( "end of statement" , & self . parser . peek_token ( ) ) ;
460460 }
461461
462462 let statement = self . parse_statement ( ) ?;
@@ -470,7 +470,7 @@ impl<'a> DFParser<'a> {
470470 fn expected < T > (
471471 & self ,
472472 expected : & str ,
473- found : TokenWithSpan ,
473+ found : & TokenWithSpan ,
474474 ) -> Result < T , DataFusionError > {
475475 let sql_parser_span = found. span ;
476476 let span = Span :: try_from_sqlparser_span ( sql_parser_span) ;
@@ -488,11 +488,11 @@ impl<'a> DFParser<'a> {
488488 fn expect_token (
489489 & mut self ,
490490 expected : & str ,
491- token : Token ,
491+ token : & Token ,
492492 ) -> Result < ( ) , DataFusionError > {
493493 let next_token = self . parser . peek_token_ref ( ) ;
494- if next_token. token != token {
495- self . expected ( expected, next_token. clone ( ) )
494+ if next_token. token != * token {
495+ self . expected ( expected, next_token)
496496 } else {
497497 Ok ( ( ) )
498498 }
@@ -553,7 +553,7 @@ impl<'a> DFParser<'a> {
553553 /// contains any trailing, unparsed tokens.
554554 pub fn parse_into_expr ( & mut self ) -> Result < ExprWithAlias , DataFusionError > {
555555 let expr = self . parse_expr ( ) ?;
556- self . expect_token ( "end of expression" , Token :: EOF ) ?;
556+ self . expect_token ( "end of expression" , & Token :: EOF ) ?;
557557 Ok ( expr)
558558 }
559559
@@ -638,7 +638,7 @@ impl<'a> DFParser<'a> {
638638 if token == Token :: EOF || token == Token :: SemiColon {
639639 break ;
640640 } else {
641- return self . expected ( "end of statement or ;" , token) ?;
641+ return self . expected ( "end of statement or ;" , & token) ?;
642642 }
643643 }
644644 }
@@ -675,15 +675,15 @@ impl<'a> DFParser<'a> {
675675 // Unquoted namespaced keys have to conform to the syntax
676676 // "<WORD>[\.<WORD>]*". If we have a key that breaks this
677677 // pattern, error out:
678- return self . expected ( "key name" , next_token) ;
678+ return self . expected ( "key name" , & next_token) ;
679679 }
680680 }
681681 Ok ( parts. join ( "." ) )
682682 }
683683 Token :: SingleQuotedString ( s) => Ok ( s) ,
684684 Token :: DoubleQuotedString ( s) => Ok ( s) ,
685685 Token :: EscapedStringLiteral ( s) => Ok ( s) ,
686- _ => self . expected ( "key name" , next_token) ,
686+ _ => self . expected ( "key name" , & next_token) ,
687687 }
688688 }
689689
@@ -702,7 +702,7 @@ impl<'a> DFParser<'a> {
702702 Token :: DoubleQuotedString ( s) => Ok ( Value :: DoubleQuotedString ( s) ) ,
703703 Token :: EscapedStringLiteral ( s) => Ok ( Value :: EscapedStringLiteral ( s) ) ,
704704 Token :: Number ( n, l) => Ok ( Value :: Number ( n, l) ) ,
705- _ => self . expected ( "string or numeric value" , next_token) ,
705+ _ => self . expected ( "string or numeric value" , & next_token) ,
706706 }
707707 }
708708
@@ -732,7 +732,7 @@ impl<'a> DFParser<'a> {
732732 Token :: Word ( w) => Ok ( w. value ) ,
733733 Token :: SingleQuotedString ( w) => Ok ( w) ,
734734 Token :: DoubleQuotedString ( w) => Ok ( w) ,
735- _ => self . expected ( "an explain format such as TREE" , next_token) ,
735+ _ => self . expected ( "an explain format such as TREE" , & next_token) ,
736736 } ?;
737737 Ok ( Some ( format) )
738738 }
@@ -777,7 +777,7 @@ impl<'a> DFParser<'a> {
777777 let identifier = self . parser . parse_identifier ( ) ?;
778778 partitions. push ( identifier. to_string ( ) ) ;
779779 } else {
780- return self . expected ( "partition name" , self . parser . peek_token ( ) ) ;
780+ return self . expected ( "partition name" , & self . parser . peek_token ( ) ) ;
781781 }
782782 let comma = self . parser . consume_token ( & Token :: Comma ) ;
783783 if self . parser . consume_token ( & Token :: RParen ) {
@@ -786,7 +786,7 @@ impl<'a> DFParser<'a> {
786786 } else if !comma {
787787 return self . expected (
788788 "',' or ')' after partition definition" ,
789- self . parser . peek_token ( ) ,
789+ & self . parser . peek_token ( ) ,
790790 ) ;
791791 }
792792 }
@@ -857,7 +857,7 @@ impl<'a> DFParser<'a> {
857857 } else {
858858 return self . expected (
859859 "column name or constraint definition" ,
860- self . parser . peek_token ( ) ,
860+ & self . parser . peek_token ( ) ,
861861 ) ;
862862 }
863863 let comma = self . parser . consume_token ( & Token :: Comma ) ;
@@ -867,7 +867,7 @@ impl<'a> DFParser<'a> {
867867 } else if !comma {
868868 return self . expected (
869869 "',' or ')' after column definition" ,
870- self . parser . peek_token ( ) ,
870+ & self . parser . peek_token ( ) ,
871871 ) ;
872872 }
873873 }
@@ -887,7 +887,7 @@ impl<'a> DFParser<'a> {
887887 } else {
888888 return self . expected (
889889 "constraint details after CONSTRAINT <name>" ,
890- self . parser . peek_token ( ) ,
890+ & self . parser . peek_token ( ) ,
891891 ) ;
892892 }
893893 } else if let Some ( option) = self . parser . parse_optional_column_option ( ) ? {
@@ -1012,7 +1012,7 @@ impl<'a> DFParser<'a> {
10121012 if token == Token :: EOF || token == Token :: SemiColon {
10131013 break ;
10141014 } else {
1015- return self . expected ( "end of statement or ;" , token) ?;
1015+ return self . expected ( "end of statement or ;" , & token) ?;
10161016 }
10171017 }
10181018 }
@@ -1051,7 +1051,7 @@ impl<'a> DFParser<'a> {
10511051 let token = self . parser . next_token ( ) ;
10521052 match & token. token {
10531053 Token :: Word ( w) => parse_file_type ( & w. value ) ,
1054- _ => self . expected ( "one of ARROW, PARQUET, NDJSON, or CSV" , token) ,
1054+ _ => self . expected ( "one of ARROW, PARQUET, NDJSON, or CSV" , & token) ,
10551055 }
10561056 }
10571057
@@ -1074,7 +1074,7 @@ impl<'a> DFParser<'a> {
10741074 } else if !comma {
10751075 return self . expected (
10761076 "',' or ')' after option definition" ,
1077- self . parser . peek_token ( ) ,
1077+ & self . parser . peek_token ( ) ,
10781078 ) ;
10791079 }
10801080 }
0 commit comments