Skip to content

Commit

Permalink
fix: fix compile fail on windows for rustc_data_structure and bump ve…
Browse files Browse the repository at this point in the history
…rsion (#1245)

* fix: fix windows compile error in rustc_data_structures

Signed-off-by: zongz <[email protected]>

* chore: bump rustc_data_structure version to 0.1.2

Signed-off-by: zongz <[email protected]>

* chore: bump rustc_span version to 0.1.2

Signed-off-by: zongz <[email protected]>

* chore: bump compiler_base_span version to 0.1.3

Signed-off-by: zongz <[email protected]>

* chore: bump compiler_base_error version to 0.1.6

Signed-off-by: zongz <[email protected]>

* chore: bump compiler_base_session version to 0.1.3

Signed-off-by: zongz <[email protected]>

* fix: bump all compiler_base dependencies version

Signed-off-by: zongz <[email protected]>

---------

Signed-off-by: zongz <[email protected]>
  • Loading branch information
zong-zhe authored Apr 24, 2024
1 parent 5871078 commit dc4190f
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 36 deletions.
4 changes: 2 additions & 2 deletions compiler_base/3rdparty/rustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustc_data_structures"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
authors = ["[email protected]"]
license = "Apache-2.0 OR MIT"
Expand Down Expand Up @@ -34,7 +34,7 @@ tempfile = "3.5.0"
version = "0.12"

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["fileapi", "psapi", "winerror"] }
winapi = { version = "0.3", features = ["std", "fileapi", "psapi", "winerror"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
memmap2 = "0.2.1"
1 change: 0 additions & 1 deletion compiler_base/3rdparty/rustc_data_structures/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![allow(rustc::default_hash_types)]
#![deny(unaligned_references)]
#![allow(rustc::potential_query_instability)]

extern crate tracing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl Drop for MaybeTempDir {
// occur.
let dir = unsafe { ManuallyDrop::take(&mut self.dir) };
if self.keep {
dir.into_path();
let _ = dir.into_path();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions compiler_base/3rdparty/rustc_span/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustc_span"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
authors = ["[email protected]"]
license = "Apache-2.0 OR MIT"
Expand All @@ -15,7 +15,7 @@ categories = ["command-line-utilities"]
doctest = false

[dependencies]
rustc_data_structures = "0.1.1"
rustc_data_structures = "0.1.2"
scoped-tls = "1.0"
unicode-width = "0.1.4"
cfg-if = "0.1.2"
Expand Down
6 changes: 3 additions & 3 deletions compiler_base/error/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "compiler_base_error"
version = "0.1.5"
version = "0.1.6"
edition = "2021"
authors = ["[email protected]"]
license = "Apache-2.0 OR MIT"
Expand All @@ -14,10 +14,10 @@ categories = ["command-line-utilities"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
compiler_base_span = "0.1.2"
compiler_base_span = "0.1.3"
compiler_base_macros = "0.1.1"
pretty_assertions = "1.3.0"
rustc_span = "0.1.1"
rustc_span = "0.1.2"
rustc_errors = "0.1.2"
unic-langid = {version="0.9.0", features = ["macros"]}

Expand Down
4 changes: 2 additions & 2 deletions compiler_base/session/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "compiler_base_session"
version = "0.1.2"
version = "0.1.3"
edition = "2021"
authors = ["[email protected]"]
license = "Apache-2.0 OR MIT"
Expand All @@ -15,5 +15,5 @@ categories = ["command-line-utilities"]

[dependencies]
compiler_base_span = "0.1.2"
compiler_base_error = "0.1.5"
compiler_base_error = "0.1.6"
anyhow = "1.0"
4 changes: 2 additions & 2 deletions compiler_base/span/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "compiler_base_span"
version = "0.1.2"
version = "0.1.3"
edition = "2021"
authors = ["[email protected]"]
license = "Apache-2.0 OR MIT"
Expand All @@ -14,4 +14,4 @@ categories = ["command-line-utilities"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rustc_span = "0.1.1"
rustc_span = "0.1.2"
20 changes: 10 additions & 10 deletions kclvm/Cargo.lock

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

2 changes: 1 addition & 1 deletion kclvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ libloading = "0.7.3"
chrono = "0.4.19"
maplit = "1.0.2"
anyhow = { version = "1.0.70", features = ["backtrace"] }
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"

kclvm-api = {path = "./api"}
kclvm-cmd = {path = "./cmd"}
Expand Down
2 changes: 1 addition & 1 deletion kclvm/ast_pretty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ kclvm-ast = {path = "../ast"}
indexmap = "1.0"
fancy-regex = "0.7.1"
pretty_assertions = "1.3.0"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"
compiler_base_macros = "0.1.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion kclvm/cmd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
anyhow = "1.0"
clap = "4.3.0"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"

kclvm-api = {path = "../api"}
kclvm-parser = {path = "../parser"}
Expand Down
4 changes: 2 additions & 2 deletions kclvm/error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ edition = "2021"

[dependencies]
compiler_base_span = "0.1.2"
compiler_base_session = "0.1.2"
compiler_base_error = "0.1.5"
compiler_base_session = "0.1.3"
compiler_base_error = "0.1.6"
compiler_base_macros = "0.1.1"
kclvm-span = {path = "../span"}
kclvm-runtime = {path = "../runtime"}
Expand Down
4 changes: 2 additions & 2 deletions kclvm/parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ edition = "2021"

[dependencies]
compiler_base_span = "0.1.2"
compiler_base_session = "0.1.2"
compiler_base_error = "0.1.5"
compiler_base_session = "0.1.3"
compiler_base_error = "0.1.6"
compiler_base_macros = "0.1.1"
tracing = "0.1"
serde = { version = "1", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion kclvm/query/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
anyhow = "1.0"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"
compiler_base_macros = "0.1.1"
indexmap = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion kclvm/runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ anyhow = "1.0"
once_cell = "1.10"
cc = "1.0"
uuid = "1.7.0"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"
compiler_base_macros = "0.1.1"

kclvm-ast = {path = "../ast"}
Expand Down
4 changes: 2 additions & 2 deletions kclvm/sema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ kclvm-error = { path = "../error" }
kclvm-span = { path = "../span" }
kclvm-utils ={ path = "../utils" }
compiler_base_span = "0.1.2"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"
compiler_base_macros = "0.1.1"
compiler_base_error = "0.1.5"
compiler_base_error = "0.1.6"
suggestions = "0.1.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion kclvm/tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ indexmap = "1.0"
fancy-regex = "0.7.1"
walkdir = "2"
anyhow = "1.0"
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"

rustc_lexer = "0.1.0"
kclvm-ast = {path = "../ast"}
Expand Down
2 changes: 1 addition & 1 deletion kclvm/tools/src/LSP/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ kclvm-sema = { path = "../../../sema" }
kclvm-ast = { path = "../../../ast" }
kclvm-utils = { path = "../../../utils" }
kclvm-version = { path = "../../../version" }
compiler_base_session = "0.1.2"
compiler_base_session = "0.1.3"
kclvm-query = { path = "../../../query" }
kclvm-span = { path = "../../../span" }

Expand Down

0 comments on commit dc4190f

Please sign in to comment.