Skip to content

File tree

14 files changed

+10
-7749
lines changed

14 files changed

+10
-7749
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"

‎compiler/rustc_apfloat/Cargo.toml

-8
This file was deleted.

‎compiler/rustc_apfloat/src/ieee.rs

-2,757
This file was deleted.

‎compiler/rustc_apfloat/src/lib.rs

-695
This file was deleted.

‎compiler/rustc_apfloat/src/ppc.rs

-434
This file was deleted.

‎compiler/rustc_apfloat/tests/ieee.rs

-3,301
This file was deleted.

‎compiler/rustc_apfloat/tests/ppc.rs

-530
This file was deleted.

‎compiler/rustc_const_eval/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
tracing = "0.1"
1010
either = "1"
11-
rustc_apfloat = { path = "../rustc_apfloat" }
11+
rustc_apfloat = "0.2.0"
1212
rustc_ast = { path = "../rustc_ast" }
1313
rustc_attr = { path = "../rustc_attr" }
1414
rustc_data_structures = { path = "../rustc_data_structures" }

‎compiler/rustc_middle/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gsgdt = "0.1.2"
1313
field-offset = "0.3.5"
1414
measureme = "10.0.0"
1515
polonius-engine = "0.13.0"
16-
rustc_apfloat = { path = "../rustc_apfloat" }
16+
rustc_apfloat = "0.2.0"
1717
rustc_arena = { path = "../rustc_arena" }
1818
rustc_ast = { path = "../rustc_ast" }
1919
rustc_attr = { path = "../rustc_attr" }

‎compiler/rustc_mir_build/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rustc_arena = { path = "../rustc_arena" }
1010
tracing = "0.1"
1111
either = "1"
1212
rustc_middle = { path = "../rustc_middle" }
13-
rustc_apfloat = { path = "../rustc_apfloat" }
13+
rustc_apfloat = "0.2.0"
1414
rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_index = { path = "../rustc_index" }
1616
rustc_errors = { path = "../rustc_errors" }

‎src/tools/tidy/src/deps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const EXCEPTIONS: &[(&str, &str)] = &[
4646
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
4747
("mdbook", "MPL-2.0"), // mdbook
4848
("openssl", "Apache-2.0"), // opt-dist
49+
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"), // rustc (license is the same as LLVM uses)
4950
("ryu", "Apache-2.0 OR BSL-1.0"), // cargo/... (because of serde)
5051
("self_cell", "Apache-2.0"), // rustc (fluent translations)
5152
("snap", "BSD-3-Clause"), // rustc
@@ -224,6 +225,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
224225
"rustc-hash",
225226
"rustc-rayon",
226227
"rustc-rayon-core",
228+
"rustc_apfloat",
227229
"rustc_version",
228230
"rustix",
229231
"ruzstd", // via object in thorin-dwp

‎src/tools/tidy/src/style.rs

-4
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,6 @@ pub fn check(path: &Path, bad: &mut bool) {
302302
return;
303303
}
304304
}
305-
// apfloat shouldn't be changed because of license problems
306-
if is_in(file, "compiler", "rustc_apfloat") {
307-
return;
308-
}
309305
let mut skip_cr = contains_ignore_directive(can_contain, &contents, "cr");
310306
let mut skip_undocumented_unsafe =
311307
contains_ignore_directive(can_contain, &contents, "undocumented-unsafe");

‎triagebot.toml

-9
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,6 @@ changelog-branch = "master"
318318

319319
[shortcut]
320320

321-
322-
[mentions."compiler/rustc_apfloat"]
323-
message = """
324-
Changes rustc_apfloat. rustc_apfloat is currently in limbo and you almost \
325-
certainly don't want to change it (see #55993).
326-
"""
327-
cc = ["@eddyb"]
328-
329321
[mentions."compiler/rustc_codegen_cranelift"]
330322
cc = ["@bjorn3"]
331323

@@ -609,7 +601,6 @@ style-team = [
609601
"/Cargo.lock" = ["@Mark-Simulacrum"]
610602
"/Cargo.toml" = ["@Mark-Simulacrum"]
611603
"/compiler" = ["compiler"]
612-
"/compiler/rustc_apfloat" = ["@eddyb"]
613604
"/compiler/rustc_ast" = ["compiler", "parser"]
614605
"/compiler/rustc_ast_lowering" = ["compiler", "ast_lowering"]
615606
"/compiler/rustc_hir_analysis" = ["compiler", "types"]

0 commit comments

Comments
 (0)
Please sign in to comment.