Skip to content

Commit e0934e7

Browse files
committed
Fix up lifetimes that can be elided
You can't propose a 26k line diff when CI fails.
1 parent 982a29b commit e0934e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+54
-54
lines changed

src/parser/alter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use alloc::vec;
1717

1818
use crate::parser::*;
1919

20-
impl<'a> Parser<'a> {
20+
impl Parser<'_> {
2121
pub fn parse_alter(&mut self) -> Result<Statement, ParserError> {
2222
let object_type = self.expect_one_of_keywords(&[
2323
Keyword::VIEW,

src/parser/analyze.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_analyze(&mut self) -> Result<Statement, ParserError> {
55
self.expect_keyword(Keyword::TABLE)?;
66
let table_name = self.parse_object_name(false)?;

src/parser/assert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_assert(&mut self) -> Result<Statement, ParserError> {
55
let condition = self.parse_expr()?;
66
let message = if self.parse_keyword(Keyword::AS) {

src/parser/assignment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a `var = expr` assignment, used in an UPDATE statement
55
pub fn parse_assignment(&mut self) -> Result<Assignment, ParserError> {
66
let target = self.parse_assignment_target()?;

src/parser/attach.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_attach_database(&mut self) -> Result<Statement, ParserError> {
55
let database = self.parse_keyword(Keyword::DATABASE);
66
let database_file_name = self.parse_expr()?;

src/parser/cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a CACHE TABLE statement
55
pub fn parse_cache_table(&mut self) -> Result<Statement, ParserError> {
66
let (mut table_flag, mut options, mut has_as, mut query) = (None, vec![], false, None);

src/parser/call.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::parser::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse a `CALL procedure_name(arg1, arg2, ...)`
77
/// or `CALL procedure_name` statement
88
pub fn parse_call(&mut self) -> Result<Statement, ParserError> {

src/parser/close.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_close(&mut self) -> Result<Statement, ParserError> {
55
let cursor = if self.parse_keyword(Keyword::ALL) {
66
CloseCursor::All

src/parser/columns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_columns(&mut self) -> Result<(Vec<ColumnDef>, Vec<TableConstraint>), ParserError> {
55
let mut columns = vec![];
66
let mut constraints = vec![];

src/parser/comment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_comment(&mut self) -> Result<Statement, ParserError> {
55
let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
66

src/parser/commit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_commit(&mut self) -> Result<Statement, ParserError> {
55
Ok(Statement::Commit {
66
chain: self.parse_commit_rollback_chain()?,

src/parser/copy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse a copy statement
77
pub fn parse_copy(&mut self) -> Result<Statement, ParserError> {
88
let source;

src/parser/deallocate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_deallocate(&mut self) -> Result<Statement, ParserError> {
55
let prepare = self.parse_keyword(Keyword::PREPARE);
66
let name = self.parse_identifier(false)?;

src/parser/declare.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a `DECLARE` statement.
55
///
66
/// ```sql

src/parser/delete.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_delete(&mut self) -> Result<Statement, ParserError> {
55
let (tables, with_from_keyword) = if !self.parse_keyword(Keyword::FROM) {
66
// `FROM` keyword is optional in BigQuery SQL.

src/parser/discard.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_discard(&mut self) -> Result<Statement, ParserError> {
55
let object_type = if self.parse_keyword(Keyword::ALL) {
66
DiscardObject::ALL

src/parser/drop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse statements of the DropTrigger type such as:
77
///
88
/// ```sql

src/parser/end.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_end(&mut self) -> Result<Statement, ParserError> {
55
Ok(Statement::Commit {
66
chain: self.parse_commit_rollback_chain()?,

src/parser/execute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_execute(&mut self) -> Result<Statement, ParserError> {
55
let name = self.parse_object_name(false)?;
66

src/parser/explain.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_explain(
55
&mut self,
66
describe_alias: DescribeAlias,

src/parser/fetch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
// FETCH [ direction { FROM | IN } ] cursor INTO target;
55
pub fn parse_fetch_statement(&mut self) -> Result<Statement, ParserError> {
66
let direction = if self.parse_keyword(Keyword::NEXT) {

src/parser/flush.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::parser::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
pub fn parse_flush(&mut self) -> Result<Statement, ParserError> {
77
let mut channel = None;
88
let mut tables: Vec<ObjectName> = vec![];

src/parser/grant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a GRANT statement.
55
pub fn parse_grant(&mut self) -> Result<Statement, ParserError> {
66
let (privileges, objects) = self.parse_grant_revoke_privileges_objects()?;

src/parser/identifier.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a simple one-word identifier (possibly quoted, possibly a keyword)
55
///
66
/// The `in_table_clause` parameter indicates whether the identifier is a table in a FROM, JOIN, or

src/parser/insert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse an INSERT statement, returning a `Box`ed SetExpr
55
///
66
/// This is used to reduce the size of the stack frames in debug builds

src/parser/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// `INSTALL [extension_name]`
55
pub fn parse_install(&mut self) -> Result<Statement, ParserError> {
66
let extension_name = self.parse_identifier(false)?;

src/parser/kill.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
// KILL [CONNECTION | QUERY | MUTATION] processlist_id
55
pub fn parse_kill(&mut self) -> Result<Statement, ParserError> {
66
let modifier_keyword =

src/parser/listen.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_listen(&mut self) -> Result<Statement, ParserError> {
55
let channel = self.parse_identifier(false)?;
66
Ok(Statement::LISTEN { channel })

src/parser/load.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// Parse a SQL LOAD statement
55
pub fn parse_load(&mut self) -> Result<Statement, ParserError> {
66
if self.dialect.supports_load_extension() {

src/parser/merge.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_merge(&mut self) -> Result<Statement, ParserError> {
55
let into = self.parse_keyword(Keyword::INTO);
66

src/parser/msck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_msck(&mut self) -> Result<Statement, ParserError> {
55
let repair = self.parse_keyword(Keyword::REPAIR);
66
self.expect_keyword(Keyword::TABLE)?;

src/parser/notify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_notify(&mut self) -> Result<Statement, ParserError> {
55
let channel = self.parse_identifier(false)?;
66
let payload = if self.consume_token(&Token::Comma) {

src/parser/optimize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
/// ```sql
55
/// OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE [BY expression]]
66
/// ```

src/parser/options.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn maybe_parse_options(
55
&mut self,
66
keyword: Keyword,

src/parser/pragma.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
// PRAGMA [schema-name '.'] pragma-name [('=' pragma-value) | '(' pragma-value ')']
55
pub fn parse_pragma(&mut self) -> Result<Statement, ParserError> {
66
let name = self.parse_object_name(false)?;

src/parser/prepare.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_prepare(&mut self) -> Result<Statement, ParserError> {
55
let name = self.parse_identifier(false)?;
66

src/parser/release.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_release(&mut self) -> Result<Statement, ParserError> {
55
let _ = self.parse_keyword(Keyword::SAVEPOINT);
66
let name = self.parse_identifier(false)?;

src/parser/replace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::parser::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse an REPLACE statement
77
pub fn parse_replace(&mut self) -> Result<Statement, ParserError> {
88
if !dialect_of!(self is MySqlDialect | GenericDialect) {

src/parser/revoke.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::parser::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse a REVOKE statement
77
pub fn parse_revoke(&mut self) -> Result<Statement, ParserError> {
88
let (privileges, objects) = self.parse_grant_revoke_privileges_objects()?;

src/parser/rollback.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_rollback(&mut self) -> Result<Statement, ParserError> {
55
let chain = self.parse_commit_rollback_chain()?;
66
let savepoint = self.parse_rollback_savepoint()?;

src/parser/savepoint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_savepoint(&mut self) -> Result<Statement, ParserError> {
55
let name = self.parse_identifier(false)?;
66
Ok(Statement::Savepoint { name })

src/parser/select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Parse a query expression, i.e. a `SELECT` statement optionally
77
/// preceded with some `WITH` CTE declarations and optionally followed
88
/// by `ORDER BY`. Unlike some other parse_... methods, this one doesn't

src/parser/set.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_set(&mut self) -> Result<Statement, ParserError> {
55
let modifier =
66
self.parse_one_of_keywords(&[Keyword::SESSION, Keyword::LOCAL, Keyword::HIVEVAR]);
@@ -18,7 +18,7 @@ impl<'a> Parser<'a> {
1818
&& self.consume_token(&Token::LParen)
1919
{
2020
let variables = OneOrManyWithParens::Many(
21-
self.parse_comma_separated(|parser: &mut Parser<'a>| {
21+
self.parse_comma_separated(|parser: &mut Parser<'_>| {
2222
parser.parse_identifier(false)
2323
})?
2424
.into_iter()

src/parser/show.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_show(&mut self) -> Result<Statement, ParserError> {
55
let terse = self.parse_keyword(Keyword::TERSE);
66
let extended = self.parse_keyword(Keyword::EXTENDED);

src/parser/start.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_start_transaction(&mut self) -> Result<Statement, ParserError> {
55
self.expect_keyword(Keyword::TRANSACTION)?;
66
Ok(Statement::StartTransaction {

src/parser/tokens.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22

33
use crate::parser_err;
44

5-
impl<'a> Parser<'a> {
5+
impl Parser<'_> {
66
/// Consume the parser and return its underlying token buffer
77
pub fn into_tokens(self) -> Vec<TokenWithSpan> {
88
self.tokens

src/parser/truncate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::parser::*;
22

3-
impl<'a> Parser<'a> {
3+
impl Parser<'_> {
44
pub fn parse_truncate(&mut self) -> Result<Statement, ParserError> {
55
let table = self.parse_keyword(Keyword::TABLE);
66
let only = self.parse_keyword(Keyword::ONLY);

0 commit comments

Comments
 (0)