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

Auto merge of #17620 - Veykril:edition-aware-parser, r=Veykril

Browse source 
Edition aware parser

Fixes https://github.com/rust-lang/rust-analyzer/issues/16324 by allowing us to properly thread through the edition to the parser
This commit is contained in:
bors 2024-07-19 14:56:56 +00:00
commit fa3dd33c27
675 changed files with 2644 additions and 1427 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project-model/src/workspace.rs
View file

@ -6,7 +6,7 @@ use std::{collections::VecDeque, fmt, fs, iter, sync};
use anyhow::Context;
use base_db::{
CrateDisplayName, CrateGraph, CrateId, CrateName, CrateOrigin, Dependency, Env, FileId,
CrateDisplayName, CrateGraph, CrateId, CrateName, CrateOrigin, Dependency, Env,
LangCrateOrigin, ProcMacroPaths, TargetLayoutLoadResult,
};
use cfg::{CfgAtom, CfgDiff, CfgOptions};
@ -14,7 +14,7 @@ use intern::{sym, Symbol};
use paths::{AbsPath, AbsPathBuf};
use rustc_hash::{FxHashMap, FxHashSet};
use semver::Version;
use span::Edition;
use span::{Edition, FileId};
use toolchain::Tool;
use tracing::instrument;
use triomphe::Arc;
@ -1470,7 +1470,7 @@ fn sysroot_to_crate_graph(
let display_name = CrateDisplayName::from_canonical_name(&stitched[krate].name);
let crate_id = crate_graph.add_crate_root(
file_id,
Edition::CURRENT,
Edition::CURRENT_FIXME,
Some(display_name),
None,
cfg_options.clone(),