From 170479099bf8ae4f63477fa6cbb0479c31ee8c5d Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Tue, 13 Dec 2022 09:44:25 +0100
Subject: Upgrade pest to 2.5.1

This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update rust/crates/pest
For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md

Test: TreeHugger
Change-Id: I9ebbdf15c20a44c5d9ec77dd3ab916aae0ef2e5f
---
 src/iterators/tokens.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/iterators/tokens.rs')

diff --git a/src/iterators/tokens.rs b/src/iterators/tokens.rs
index 59b75c5..0d46271 100644
--- a/src/iterators/tokens.rs
+++ b/src/iterators/tokens.rs
@@ -7,14 +7,15 @@
 // option. All files in the project carrying such notice may not be copied,
 // modified, or distributed except according to those terms.
 
-use std::fmt;
-use std::rc::Rc;
-use std::str;
+use alloc::rc::Rc;
+use alloc::vec::Vec;
+use core::fmt;
+use core::str;
 
 use super::queueable_token::QueueableToken;
-use position;
-use token::Token;
-use RuleType;
+use crate::position;
+use crate::token::Token;
+use crate::RuleType;
 
 /// An iterator over [`Token`]s. It is created by [`Pair::tokens`] and [`Pairs::tokens`].
 ///
@@ -38,7 +39,7 @@ pub fn new<R: RuleType>(
     input: &str,
     start: usize,
     end: usize,
-) -> Tokens<R> {
+) -> Tokens<'_, R> {
     if cfg!(debug_assertions) {
         for tok in queue.iter() {
             match *tok {
@@ -122,7 +123,7 @@ impl<'i, R: RuleType> DoubleEndedIterator for Tokens<'i, R> {
 }
 
 impl<'i, R: RuleType> fmt::Debug for Tokens<'i, R> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_list().entries(self.clone()).finish()
     }
 }
@@ -132,13 +133,14 @@ mod tests {
     use super::super::super::macros::tests::*;
     use super::super::super::Parser;
     use super::Token;
+    use alloc::vec::Vec;
 
     #[test]
     fn double_ended_iter_for_tokens() {
         let pairs = AbcParser::parse(Rule::a, "abcde").unwrap();
-        let mut tokens = pairs.clone().tokens().collect::<Vec<Token<Rule>>>();
+        let mut tokens = pairs.clone().tokens().collect::<Vec<Token<'_, Rule>>>();
         tokens.reverse();
-        let reverse_tokens = pairs.tokens().rev().collect::<Vec<Token<Rule>>>();
+        let reverse_tokens = pairs.tokens().rev().collect::<Vec<Token<'_, Rule>>>();
         assert_eq!(tokens, reverse_tokens);
     }
 }
-- 
cgit v1.2.3