language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 04:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: Bump Edition::CURRENT to 2024

Browse source
This commit is contained in:
Lukas Wirth 2025-03-14 14:42:09 +01:00
parent 23e8d13531
commit a505420751
24 changed files with 277 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/test-fixture/src/lib.rs
View file

@ -145,6 +145,7 @@ impl ChangeFixture {
let mut crates = FxHashMap::default();
let mut crate_deps = Vec::new();
let mut default_crate_root: Option<FileId> = None;
let mut default_edition = Edition::CURRENT;
let mut default_cfg = CfgOptions::default();
let mut default_env = Env::from_iter([(
String::from("__ra_is_test_fixture"),
@ -228,6 +229,7 @@ impl ChangeFixture {
} else if meta.path == "/main.rs" || meta.path == "/lib.rs" {
assert!(default_crate_root.is_none());
default_crate_root = Some(file_id);
default_edition = meta.edition;
default_cfg.extend(meta.cfg.into_iter());
default_env.extend_from_other(&meta.env);
}
@ -244,7 +246,7 @@ impl ChangeFixture {
.expect("missing default crate root, specify a main.rs or lib.rs");
crate_graph.add_crate_root(
crate_root,
Edition::CURRENT,
default_edition,
Some(CrateName::new("ra_test_fixture").unwrap().into()),
None,
default_cfg.clone(),