Avoid gazebo str_pattern_extensions

Summary: It requires nightly.

Reviewed By: bobyangyf

Differential Revision: D41091687

fbshipit-source-id: ef131c629490adfe68f3f2a42cf87aab6d20fe51

Author: stepancheg

starlark/Cargo.toml

@@ -35,10 +35,10 @@ memoffset = "0.6.4"
 thiserror = "1.0.36"
 starlark_derive = { version = "0.9.0-pre", path = "../starlark_derive" }
 starlark_map = { version = "0.9.0-pre", path = "../starlark_map" }
-gazebo = { workspace = true, features = ["str_pattern_extensions"] }
 gazebo_lint.version = "0.1"
 gazebo_lint.optional = true
 # @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"
+gazebo = { workspace = true }
 walkdir = "2.3"
 serde = { version = "1.0", features = ["derive"] }
 logos = "0.12"

starlark/bin/main.rs

@@ -221,8 +221,7 @@ fn main() -> anyhow::Result<()> {
         let ext = args
             .extension
             .as_ref()
-            .map_or("bzl", |x| x.as_str())
-            .trim_start_match('.');
+            .map_or("bzl", |x| x.strip_prefix('.').unwrap_or(x.as_str()));
         let mut ctx = Context::new(
             if args.check {
                 ContextMode::Check

starlark/src/analysis/names.rs

@@ -18,7 +18,6 @@
 use std::collections::HashMap;
 use std::collections::HashSet;
 
-use gazebo::prelude::*;
 use gazebo::variants::VariantName;
 use thiserror::Error;
 
@@ -279,7 +278,7 @@ fn use_ignored(
                         let defined_at_root =
                             || root.bound.contains_key(&x.node) && scope.free.contains_key(&x.node);
                         let shadows = || {
-                            let suffix = x.trim_start_match('_');
+                            let suffix = &x[1..];
                             scope.free.contains_key(suffix) || scope.bound.contains_key(suffix)
                         };
                         if !defined_at_root() && !shadows() {
@@ -300,6 +299,8 @@ fn use_ignored(
 
 #[cfg(test)]
 mod tests {
+    use gazebo::prelude::*;
+
     use super::*;
     use crate::syntax::Dialect;
 

starlark/src/assert/conformance.rs

@@ -23,7 +23,6 @@
 // We want to carefully control the panic message.
 #![allow(clippy::if_then_panic)]
 
-use gazebo::prelude::*;
 use itertools::Itertools;
 
 use crate::assert::assert::Assert;
@@ -78,7 +77,12 @@ impl ConformanceTest {
                 error: xs
                     .iter()
                     .find_position(|x| x.contains("###"))
-                    .map(|(i, x)| (i + 1, (**x).split1("###").1.trim_start().to_owned())),
+                    .map(|(i, x)| {
+                        (
+                            i + 1,
+                            (**x).split_once("###").unwrap().1.trim_start().to_owned(),
+                        )
+                    }),
             })
             .collect()
     }