Skip to content

Commit

Permalink
Tweak versions
Browse files Browse the repository at this point in the history
Notably this pins serde at 1.0.171, see context:

rust-lang/rust-analyzer#15482
  • Loading branch information
azdavis committed Aug 19, 2023
1 parent fa77943 commit a4d313a
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 38 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ publish = false

[workspace.dependencies]
# third-party
anyhow = "1"
better-panic = "0.3"
codespan-reporting = "0.11"
crossbeam-channel = "0.5"
drop_bomb = "0.1"
env_logger = "0.10"
flate2 = "1"
la-arena = "0.3"
log = "0.4"
lsp-server = "0.7"
lsp-types = { version = "0.93", features = ["proposed"] }
num-bigint = "0.4"
num-traits = "0.2"
once_cell = "1"
pico-args = "0.5"
pretty_assertions = "1"
pulldown-cmark = "0.9"
rowan = "0.15"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
toml = "0.7"
anyhow = "1.0.75"
better-panic = "0.3.0"
codespan-reporting = "0.11.1"
crossbeam-channel = "0.5.8"
drop_bomb = "0.1.5"
env_logger = "0.10.0"
flate2 = "1.0.27"
la-arena = "0.3.1"
log = "0.4.20"
lsp-server = "0.7.3"
lsp-types = { version = "0.94.1", features = ["proposed"] }
num-bigint = "0.4.3"
num-traits = "0.2.16"
once_cell = "1.18.0"
pico-args = "0.5.0"
pretty_assertions = "1.4.0"
pulldown-cmark = "0.9.3"
rowan = "0.15.11"
serde = { version = "=1.0.171", features = ["derive"] }
serde_json = "1.0.105"
toml = "0.7.6"
# language-util
code-h2-md-map.git = "https://github.com/azdavis/language-util.git"
diagnostic.git = "https://github.com/azdavis/language-util.git"
Expand Down
10 changes: 7 additions & 3 deletions crates/lang-srv/src/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ pub(crate) fn init(init: lsp_types::InitializeParams, sender: Sender<Message>) -
if let Mode::Root(root) = &ret.mode {
// we'd like to only listen to millet.toml, not all toml, but "nested alternate groups are
// not allowed" at time of writing.
let glob_pattern =
format!("{}/**/*.{{sml,sig,fun,cm,mlb,toml}}", root.path.as_path().display());
let watchers = vec![lsp_types::FileSystemWatcher { glob_pattern, kind: None }];
let watchers = vec![lsp_types::FileSystemWatcher {
glob_pattern: lsp_types::GlobPattern::Relative(lsp_types::RelativePattern {
base_uri: lsp_types::OneOf::Right(convert::file_url(root.path.as_path()).unwrap()),
pattern: "**/*.{sml,sig,fun,cm,mlb,toml}".to_owned(),
}),
kind: None,
}];
let did_changed_registration =
convert::registration::<lsp_types::notification::DidChangeWatchedFiles, _>(
lsp_types::DidChangeWatchedFilesRegistrationOptions { watchers },
Expand Down

0 comments on commit a4d313a

Please sign in to comment.