Skip to content

Commit 4c0dea5

Browse files
committed
fix gen name, now reserved keyword
1 parent 346aaac commit 4c0dea5

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

crates/compilers/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ tokio = { workspace = true, optional = true }
3939
auto_impl = "1"
4040
winnow = "0.7"
4141
dyn-clone = "1"
42-
derive_more = { version = "1", features = ["debug"] }
42+
derive_more = { version = "2", features = ["debug"] }
4343
home = "0.5"
4444
dirs = "6.0"
4545
itertools = ">=0.13, <=0.14"
4646

4747
# project-util
4848
tempfile = { version = "3.20", optional = true }
4949
fs_extra = { version = "1.3", optional = true }
50-
rand = { version = "0.8", optional = true }
50+
rand = { version = "0.9", optional = true }
5151

5252
# svm
5353
svm = { workspace = true, optional = true }

crates/compilers/src/project_util/mock.rs

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ impl MockProjectGenerator {
7070
}
7171

7272
let graph = Graph::<MultiCompilerParsedSource>::resolve(paths)?;
73-
let mut gen = Self::default();
73+
let mut generated = Self::default();
7474
let (_, edges) = graph.into_sources();
7575

7676
// add all files as source files
77-
gen.add_sources(edges.files().count());
77+
generated.add_sources(edges.files().count());
7878

7979
// stores libs and their files
8080
let libs = get_libs(
@@ -85,25 +85,25 @@ impl MockProjectGenerator {
8585

8686
// mark all files as libs
8787
for (lib_id, lib_files) in libs.into_values().enumerate() {
88-
let lib_name = gen.name_strategy.new_lib_name(lib_id);
89-
let offset = gen.inner.files.len();
88+
let lib_name = generated.name_strategy.new_lib_name(lib_id);
89+
let offset = generated.inner.files.len();
9090
let lib = MockLib { name: lib_name, id: lib_id, num_files: lib_files.len(), offset };
9191
for lib_file in lib_files {
92-
let file = &mut gen.inner.files[lib_file];
92+
let file = &mut generated.inner.files[lib_file];
9393
file.lib_id = Some(lib_id);
94-
file.name = gen.name_strategy.new_lib_name(file.id);
94+
file.name = generated.name_strategy.new_lib_name(file.id);
9595
}
96-
gen.inner.libraries.push(lib);
96+
generated.inner.libraries.push(lib);
9797
}
9898

9999
for id in edges.files() {
100100
for import in edges.imported_nodes(id).iter().copied() {
101-
let import = gen.get_import(import);
102-
gen.inner.files[id].imports.insert(import);
101+
let import = generated.get_import(import);
102+
generated.inner.files[id].imports.insert(import);
103103
}
104104
}
105105

106-
Ok(gen)
106+
Ok(generated)
107107
}
108108

109109
/// Consumes the type and returns the underlying skeleton
@@ -437,11 +437,16 @@ impl MockFile {
437437

438438
pub fn target_path<L: Language>(
439439
&self,
440-
gen: &MockProjectGenerator,
440+
generated: &MockProjectGenerator,
441441
paths: &ProjectPathsConfig<L>,
442442
) -> PathBuf {
443443
let mut target = if let Some(lib) = self.lib_id {
444-
paths.root.join("lib").join(&gen.inner.libraries[lib].name).join("src").join(&self.name)
444+
paths
445+
.root
446+
.join("lib")
447+
.join(&generated.inner.libraries[lib].name)
448+
.join("src")
449+
.join(&self.name)
445450
} else {
446451
paths.sources.join(&self.name)
447452
};

0 commit comments

Comments
 (0)