fix: fix compile fail on windows for rustc_data_structure and bump version (#1245)

zong-zhe · web-flow · commit dc4190f9b015 · 2024-04-24T20:55:58.000+08:00
* fix: fix windows compile error in rustc_data_structures

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* chore: bump rustc_data_structure version to 0.1.2

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* chore: bump rustc_span version to 0.1.2

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* chore: bump compiler_base_span version to 0.1.3

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* chore: bump compiler_base_error version to 0.1.6

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* chore: bump compiler_base_session version to 0.1.3

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

* fix: bump all compiler_base dependencies version

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;

---------

Signed-off-by: zongz &lt;zongzhe1024@163.com&gt;
diff --git a/compiler_base/3rdparty/rustc_data_structures/Cargo.toml b/compiler_base/3rdparty/rustc_data_structures/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_data_structures"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["zongzhe1024@163.com"]
 license = "Apache-2.0 OR MIT"
@@ -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"
diff --git a/compiler_base/3rdparty/rustc_data_structures/src/lib.rs b/compiler_base/3rdparty/rustc_data_structures/src/lib.rs
@@ -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;
diff --git a/compiler_base/3rdparty/rustc_data_structures/src/temp_dir.rs b/compiler_base/3rdparty/rustc_data_structures/src/temp_dir.rs
@@ -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();
         }
     }
 }
diff --git a/compiler_base/3rdparty/rustc_span/Cargo.toml b/compiler_base/3rdparty/rustc_span/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_span"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["zongzhe1024@163.com"]
 license = "Apache-2.0 OR MIT"
@@ -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"
diff --git a/compiler_base/error/Cargo.toml b/compiler_base/error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compiler_base_error"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 authors = ["zongzhe1024@163.com"]
 license = "Apache-2.0 OR MIT"
@@ -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"]}
 
diff --git a/compiler_base/session/Cargo.toml b/compiler_base/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compiler_base_session"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 authors = ["zongzhe1024@163.com"]
 license = "Apache-2.0 OR MIT"
@@ -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"
diff --git a/compiler_base/span/Cargo.toml b/compiler_base/span/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compiler_base_span"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 authors = ["zongzhe1024@163.com"]
 license = "Apache-2.0 OR MIT"
@@ -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"
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/Cargo.toml b/kclvm/Cargo.toml
@@ -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"}
diff --git a/kclvm/ast_pretty/Cargo.toml b/kclvm/ast_pretty/Cargo.toml
@@ -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]
diff --git a/kclvm/cmd/Cargo.toml b/kclvm/cmd/Cargo.toml
@@ -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"}
diff --git a/kclvm/error/Cargo.toml b/kclvm/error/Cargo.toml
@@ -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"}
diff --git a/kclvm/parser/Cargo.toml b/kclvm/parser/Cargo.toml
@@ -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"] }
diff --git a/kclvm/query/Cargo.toml b/kclvm/query/Cargo.toml
@@ -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"
 
diff --git a/kclvm/runner/Cargo.toml b/kclvm/runner/Cargo.toml
@@ -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"}
diff --git a/kclvm/sema/Cargo.toml b/kclvm/sema/Cargo.toml
@@ -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]
diff --git a/kclvm/tools/Cargo.toml b/kclvm/tools/Cargo.toml
@@ -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"}
diff --git a/kclvm/tools/src/LSP/Cargo.toml b/kclvm/tools/src/LSP/Cargo.toml
@@ -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" }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ impl Drop for MaybeTempDir {`
`16`	`16`	`// occur.`
`17`	`17`	`let dir = unsafe { ManuallyDrop::take(&mut self.dir) };`
`18`	`18`	`if self.keep {`
`19`		`- dir.into_path();`
	`19`	`+ let _ = dir.into_path();`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`