Skip to content

Commit 0d50ab7

Browse files
committedJul 6, 2023
Auto merge of #113391 - fee1-dead-contrib:rollup-9bqlw9z, r=fee1-dead
Rollup of 9 pull requests Successful merges: - #111119 (style-guide: Add chapter about formatting for nightly-only syntax) - #112791 (llvm ffi: Expose `CallInst->setTailCallKind`) - #113145 (style-guide: Document newline rules for assignment operators) - #113163 (Add a regression test for #112895) - #113332 (resolve: Use `Interned` for some interned structures) - #113334 (Revert the lexing of `c"…"` string literals) - #113350 (Fix the issue of wrong diagnosis for extern pub fn) - #113371 (Fix submodule handling when the current branch is named after a tag) - #113384 (style-guide: Clarify grammar for small patterns (not a semantic change)) r? `@ghost` `@rustbot` modify labels: rollup
2 parents bd8aabe + c668eb0 commit 0d50ab7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+572
-370
lines changed
 

‎Cargo.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,16 @@ dependencies = [
766766
"typenum",
767767
]
768768

769+
[[package]]
770+
name = "cstr"
771+
version = "0.2.8"
772+
source = "registry+https://github.com/rust-lang/crates.io-index"
773+
checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
774+
dependencies = [
775+
"proc-macro2",
776+
"quote",
777+
]
778+
769779
[[package]]
770780
name = "ctrlc"
771781
version = "3.4.0"
@@ -3016,6 +3026,7 @@ name = "rustc_codegen_llvm"
30163026
version = "0.0.0"
30173027
dependencies = [
30183028
"bitflags 1.3.2",
3029+
"cstr",
30193030
"libc",
30203031
"measureme",
30213032
"object",

‎compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ test = false
88

99
[dependencies]
1010
bitflags = "1.0"
11+
cstr = "0.2"
1112
libc = "0.2"
1213
measureme = "10.0.0"
1314
object = { version = "0.31.1", default-features = false, features = [

0 commit comments

Comments
 (0)
Please sign in to comment.