Skip to content

Commit dd582c0

Browse files
authored
Merge pull request #38668 from nrc/beta-emit-metadata
Remove --crate-type=metadata from beta
2 parents d9a0f0d + 90c8538 commit dd582c0

File tree

11 files changed

+2
-209
lines changed

11 files changed

+2
-209
lines changed

src/librustc/session/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ pub enum CrateType {
482482
CrateTypeStaticlib,
483483
CrateTypeCdylib,
484484
CrateTypeProcMacro,
485+
// Should not be present.
485486
CrateTypeMetadata,
486487
}
487488

@@ -1558,7 +1559,6 @@ pub fn parse_crate_types_from_list(list_list: Vec<String>) -> Result<Vec<CrateTy
15581559
"cdylib" => CrateTypeCdylib,
15591560
"bin" => CrateTypeExecutable,
15601561
"proc-macro" => CrateTypeProcMacro,
1561-
"metadata" => CrateTypeMetadata,
15621562
_ => {
15631563
return Err(format!("unknown crate type: `{}`",
15641564
part));
@@ -1643,7 +1643,7 @@ impl fmt::Display for CrateType {
16431643
CrateTypeStaticlib => "staticlib".fmt(f),
16441644
CrateTypeCdylib => "cdylib".fmt(f),
16451645
CrateTypeProcMacro => "proc-macro".fmt(f),
1646-
CrateTypeMetadata => "metadata".fmt(f),
1646+
CrateTypeMetadata => unreachable!(),
16471647
}
16481648
}
16491649
}

src/test/compile-fail/auxiliary/rmeta_meta.rs

-17
This file was deleted.

src/test/compile-fail/auxiliary/rmeta_rlib.rs

-15
This file was deleted.

src/test/compile-fail/rmeta-lib-pass.rs

-25
This file was deleted.

src/test/compile-fail/rmeta-pass.rs

-26
This file was deleted.

src/test/compile-fail/rmeta.rs

-19
This file was deleted.

src/test/compile-fail/rmeta_lib.rs

-23
This file was deleted.

src/test/compile-fail/rmeta_meta_main.rs

-24
This file was deleted.

src/test/run-pass/auxiliary/rmeta_rlib.rs

-18
This file was deleted.

src/test/run-pass/auxiliary/rmeta_rmeta.rs

-18
This file was deleted.

src/test/run-pass/rmeta.rs

-22
This file was deleted.

0 commit comments

Comments
 (0)