Skip to content

Commit f499ffa

Browse files
authored
Rollup merge of rust-lang#62443 - Centril:rollup-dksavfb, r=Centril
Rollup of 4 pull requests [2] Successful merges: - rust-lang#59800 (rustc: Remove `dylib` crate type from most rustc crates) - rust-lang#60081 (Refactor unicode.py script) - rust-lang#62270 (Move async-await tests from run-pass to ui) - rust-lang#62281 (Add support for pc-relative addressing on 64-bit RISC-V) Failed merges: r? @ghost
2 parents 821a939 + 5c6b58e commit f499ffa

File tree

50 files changed

+775
-552
lines changed

Some content is hidden

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

50 files changed

+775
-552
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ __pycache__/
3636
/src/libcore/unicode/Scripts.txt
3737
/src/libcore/unicode/SpecialCasing.txt
3838
/src/libcore/unicode/UnicodeData.txt
39+
/src/libcore/unicode/downloaded
3940
/stage[0-9]+/
4041
/target
4142
target/

Cargo.lock

+1-15
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,6 @@ dependencies = [
24562456
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
24572457
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
24582458
"chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
2459-
"flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
24602459
"fmt_macros 0.0.0",
24612460
"graphviz 0.0.0",
24622461
"jobserver 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2479,7 +2478,6 @@ dependencies = [
24792478
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
24802479
"syntax 0.0.0",
24812480
"syntax_pos 0.0.0",
2482-
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
24832481
]
24842482

24852483
[[package]]
@@ -2711,7 +2709,6 @@ name = "rustc_apfloat"
27112709
version = "0.0.0"
27122710
dependencies = [
27132711
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2714-
"rustc_cratesio_shim 0.0.0",
27152712
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
27162713
]
27172714

@@ -2749,6 +2746,7 @@ dependencies = [
27492746
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
27502747
"rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
27512748
"rustc_llvm 0.0.0",
2749+
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
27522750
]
27532751

27542752
[[package]]
@@ -2795,15 +2793,6 @@ dependencies = [
27952793
"syntax_pos 0.0.0",
27962794
]
27972795

2798-
[[package]]
2799-
name = "rustc_cratesio_shim"
2800-
version = "0.0.0"
2801-
dependencies = [
2802-
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2803-
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
2804-
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2805-
]
2806-
28072796
[[package]]
28082797
name = "rustc_data_structures"
28092798
version = "0.0.0"
@@ -2819,7 +2808,6 @@ dependencies = [
28192808
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
28202809
"rustc-rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
28212810
"rustc-rayon-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2822-
"rustc_cratesio_shim 0.0.0",
28232811
"serialize 0.0.0",
28242812
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28252813
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2868,7 +2856,6 @@ dependencies = [
28682856
"annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
28692857
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
28702858
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
2871-
"rustc_cratesio_shim 0.0.0",
28722859
"rustc_data_structures 0.0.0",
28732860
"serialize 0.0.0",
28742861
"syntax_pos 0.0.0",
@@ -3098,7 +3085,6 @@ version = "0.0.0"
30983085
dependencies = [
30993086
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
31003087
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
3101-
"rustc_cratesio_shim 0.0.0",
31023088
"rustc_data_structures 0.0.0",
31033089
"serialize 0.0.0",
31043090
"syntax_pos 0.0.0",

src/libarena/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2018"
77
[lib]
88
name = "arena"
99
path = "lib.rs"
10-
crate-type = ["dylib"]
1110

1211
[dependencies]
1312
rustc_data_structures = { path = "../librustc_data_structures" }

0 commit comments

Comments
 (0)