Skip to content

Commit e5bede1

Browse files
committed
Merge from rustc
2 parents 3a1a03a + d150dbb commit e5bede1

File tree

95 files changed

+1017
-8395
lines changed

Some content is hidden

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

95 files changed

+1017
-8395
lines changed

.reuse/dep5

-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ Files: compiler/*
3838
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
3939
License: MIT or Apache-2.0
4040

41-
Files: compiler/rustc_apfloat/*
42-
Copyright: LLVM APFloat authors
43-
The Rust Project Developers (see https://thanks.rust-lang.org)
44-
License: NCSA AND (MIT OR Apache-2.0)
45-
4641
Files: compiler/rustc_codegen_cranelift/src/cranelift_native.rs
4742
Copyright: The Cranelift Project Developers
4843
The Rust Project Developers (see https://thanks.rust-lang.org)

Cargo.lock

+5-3
Original file line numberDiff line numberDiff line change
@@ -3135,7 +3135,9 @@ dependencies = [
31353135

31363136
[[package]]
31373137
name = "rustc_apfloat"
3138-
version = "0.0.0"
3138+
version = "0.2.0+llvm-462a31f5a5ab"
3139+
source = "registry+https://github.com/rust-lang/crates.io-index"
3140+
checksum = "465187772033a5ee566f69fe008df03628fce549a0899aae76f0a0c2e34696be"
31393141
dependencies = [
31403142
"bitflags 1.3.2",
31413143
"smallvec",
@@ -4725,9 +4727,9 @@ dependencies = [
47254727

47264728
[[package]]
47274729
name = "smallvec"
4728-
version = "1.10.0"
4730+
version = "1.11.0"
47294731
source = "registry+https://github.com/rust-lang/crates.io-index"
4730-
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
4732+
checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
47314733

47324734
[[package]]
47334735
name = "snap"

LICENSES/NCSA.txt

-15
This file was deleted.

compiler/rustc_apfloat/Cargo.toml

-8
This file was deleted.

0 commit comments

Comments
 (0)