chore: upgrade to rust 1.87.0

MODULE.bazel

@@ -16,7 +16,7 @@ use_repo(zig_toolchains, "zig_sdk")
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
     edition = "2021",
-    versions = ["nightly/2023-12-06"],
+    versions = ["1.87.0"],
     extra_target_triples = ["aarch64-unknown-linux-gnu"],
 )
 

crates/starpls/src/document.rs

@@ -363,7 +363,7 @@ impl DefaultFileLoader {
         Ok((file_id, contents))
     }
 
-    fn repo_for_path<'a>(&'a self, path: &'a Path) -> Option<&str> {
+    fn repo_for_path<'a>(&'a self, path: &'a Path) -> Option<&'a str> {
         match path.strip_prefix(&self.external_output_base) {
             Ok(stripped) => stripped
                 .components()

crates/starpls_bazel/src/label.rs

@@ -24,7 +24,7 @@ pub struct Label<'a> {
 }
 
 impl<'a> Label<'a> {
-    pub fn parse(input: &'a str) -> ParseResult {
+    pub fn parse(input: &'a str) -> ParseResult<'a> {
         Parser {
             chars: input.chars(),
             pos: 0,

crates/starpls_hir/src/def/resolver.rs

@@ -97,7 +97,7 @@ impl<'a> Resolver<'a> {
     pub(crate) fn resolve_name(
         &'a self,
         name: &'a Name,
-    ) -> Option<(ExecutionScopeId, impl Iterator<Item = SymbolDef<'a>> + '_)> {
+    ) -> Option<(ExecutionScopeId, impl Iterator<Item = SymbolDef<'a>>)> {
         let mut defs = self
             .scopes_with_id()
             .filter_map(move |(scope_id, scope)| {

crates/starpls_hir/src/typeck.rs

@@ -926,10 +926,9 @@ impl Param {
                     HirDefParam::KwargsDict { .. }
                 )
             }
-            ParamInner::IntrinsicParam { parent, index } => matches!(
-                parent.params(db)[index],
-                IntrinsicFunctionParam::KwargsDict { .. }
-            ),
+            ParamInner::IntrinsicParam { parent, index } => {
+                matches!(parent.params(db)[index], IntrinsicFunctionParam::KwargsDict)
+            }
             ParamInner::BuiltinParam { parent, index } => matches!(
                 parent.params(db)[index],
                 BuiltinFunctionParam::KwargsDict { .. }
@@ -1460,7 +1459,10 @@ pub(crate) struct Rule {
 }
 
 impl Rule {
-    pub(crate) fn attrs<'a>(&'a self, db: &'a dyn Db) -> impl Iterator<Item = (&Name, &Attribute)> {
+    pub(crate) fn attrs<'a>(
+        &'a self,
+        db: &'a dyn Db,
+    ) -> impl Iterator<Item = (&'a Name, &'a Attribute)> {
         // This chaining is done to put the `name` attribute first.
         let common = common_attributes_query(db);
         let mut common_attrs = match self.kind {

crates/starpls_hir/src/typeck/infer.rs

@@ -1662,7 +1662,7 @@ impl TyContext<'_> {
                         continue;
                     }
                 }
-                FlowNode::Unreachable { .. } => Ty::never(),
+                FlowNode::Unreachable => Ty::never(),
             };
 
             break Some(curr_node_ty);

crates/starpls_ide/src/completions.rs

@@ -233,7 +233,7 @@ pub(crate) fn completions(
             for candidate in db.list_load_candidates(&value, file_id).ok()?? {
                 let start = TextSize::from(
                     value
-                        .rfind(&['/', ':', '@'])
+                        .rfind(['/', ':', '@'])
                         .map(|start| {
                             if candidate.replace_trailing_slash {
                                 start
@@ -569,7 +569,7 @@ impl CompletionContext {
 }
 
 fn strip_last_package_or_target(label: &str) -> &str {
-    if let Some(index) = label.rfind(&[':', '/']) {
+    if let Some(index) = label.rfind([':', '/']) {
         &label[..index + 1]
     } else {
         label

crates/starpls_ide/src/lib.rs

@@ -470,6 +470,7 @@ pub trait FileLoader: Send + Sync + 'static {
 
 /// Simple implementation of [`FileLoader`] backed by a HashMap.
 /// Mainly used for tests.
+#[allow(dead_code)]
 #[derive(Default)]
 pub(crate) struct SimpleFileLoader(DashMap<String, LoadFileResult>);
 

crates/starpls_intern/src/lib.rs

@@ -195,6 +195,7 @@ pub struct InternStorage<T: ?Sized> {
 }
 
 impl<T: ?Sized> InternStorage<T> {
+    #[allow(clippy::new_without_default)]
     pub const fn new() -> Self {
         Self {
             map: OnceLock::new(),

crates/starpls_parser/src/grammar/expressions.rs

@@ -41,10 +41,7 @@ pub(crate) fn binary_expr(
     tokens: &[SyntaxKind],
     next: fn(&mut Parser) -> Option<CompletedMarker>,
 ) -> Option<CompletedMarker> {
-    let mut m = match next(p) {
-        Some(m) => m,
-        None => return None,
-    };
+    let mut m = next(p)?;
 
     while tokens.contains(&p.current()) {
         let binary_marker = m.precede(p);
@@ -88,10 +85,7 @@ fn and_expr(p: &mut Parser) -> Option<CompletedMarker> {
 
 fn comparison_expr(p: &mut Parser) -> Option<CompletedMarker> {
     const COMP_TOKENS: &[SyntaxKind] = &[T![==], T![!=], T![<], T![>], T![<=], T![>=], T![in]];
-    let mut m = match bitwise_or_expr(p) {
-        Some(m) => m,
-        None => return None,
-    };
+    let mut m = bitwise_or_expr(p)?;
 
     loop {
         let is_not_in = if COMP_TOKENS.contains(&p.current()) {
@@ -150,10 +144,7 @@ fn unary_expr(p: &mut Parser) -> Option<CompletedMarker> {
 
 /// Parses a function call, subscript expression, or member access.
 pub(crate) fn primary_expr(p: &mut Parser) -> Option<CompletedMarker> {
-    let mut m = match operand_expr(p) {
-        Some(m) => m,
-        None => return None,
-    };
+    let mut m = operand_expr(p)?;
 
     loop {
         let next = match p.current() {

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-12-06"
+channel = "1.87.0"

vendor/runfiles/src/lib.rs

@@ -303,7 +303,7 @@ pub fn find_runfiles_dir() -> Result<PathBuf> {
             while let Some(ancestor) = next {
                 if ancestor
                     .file_name()
-                    .map_or(false, |f| f.to_string_lossy().ends_with(".runfiles"))
+                    .is_some_and(|f| f.to_string_lossy().ends_with(".runfiles"))
                 {
                     return Ok(ancestor.to_path_buf());
                 }