fluencelabs/lalrpop
1
0
Fork 0
mirror of https://github.com/fluencelabs/lalrpop synced 2025-04-25 03:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated trim_left with trim_start (#458)

Browse Source 
Now that our minimum supported Rust version is 1.31.0, we can make the
switch from `String::trim_left` (deprecated since 1.33.0) to
`String::trim_start`.

This also lets us get rid of the `allow(deprecated)` introduced as a
workaround for issue #428.
This commit is contained in:
Jan Teske 2019-05-01 00:34:57 +02:00 committed by Markus Westerlind
parent d384284d4e
commit 6350641977
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lalrpop/src/lexer/intern_token/mod.rs
View File

@ -175,8 +175,7 @@ pub fn compile<W: Write>(
rust!(out, "fn next(&mut self) -> Option<Self::Item> {{");
// start by trimming whitespace from left
rust!(out, "#[allow(deprecated)]");
rust!(out, "let {}text = self.text.trim_left();", prefix);
rust!(out, "let {}text = self.text.trim_start();", prefix);
rust!(
out,
"let {}whitespace = self.text.len() - {}text.len();",

6
lalrpop/src/lr1/lane_table/test.rs
View File

@ -164,7 +164,7 @@ fn g0_conflict_1() {
| S0 | | ["c"] | ["d"] | {S3} |
| S3 | ["e"] | [] | [] | {S3} |
"#
.trim_left(),
.trim_start(),
);
}
@ -188,7 +188,7 @@ fn paper_example_g1_conflict_1() {
| S2 | | ["c"] | ["d"] | {S5} |
| S5 | ["e"] | [] | [] | {S5} |
"#
.trim_left(),
.trim_start(),
);
}
@ -326,7 +326,7 @@ fn large_conflict_1() {
| S27 | ["s"] | ["k"] | | | {S32} |
| S32 | | | ["z"] | ["u"] | {S16} |
"#
.trim_left(),
.trim_start(),
);
// ^^ This differs in some particulars from what appears in the