diff options
| author | bors <bors@rust-lang.org> | 2020-10-14 23:11:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-14 23:11:04 +0000 |
| commit | f42692b1cc1552abf905f9b6650061d246024252 (patch) | |
| tree | 105f21dd23e20b18131c6d36524b393c182d3bca /compiler/rustc_codegen_ssa/src | |
| parent | e160e5cb80652bc2afe74cb3affbe35b74243ea9 (diff) | |
| parent | 00100a457644eecaa2680d8e37484dd7b2fc6d1d (diff) | |
Auto merge of #77954 - JohnTitor:rollup-bpoy497, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #77570 (Allow ascii whitespace char for doc aliases ) - #77739 (Remove unused code) - #77753 (Check html comments) - #77879 (Provide better documentation and help messages for x.py setup) - #77902 (Include aarch64-pc-windows-msvc in the dist manifests) - #77934 (Document -Z codegen-backend in the unstable book) - #77936 (Remove needless alloc_slice) - #77946 (Validate references to source scopes) - #77951 (Update books) Failed merges: r? `@ghost`
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index 3a7676d30bb..a586b37361e 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -1519,8 +1519,6 @@ fn start_executing_work<B: ExtraBackendMethods>( } } -pub const CODEGEN_WORKER_ID: usize = usize::MAX; - /// `FatalError` is explicitly not `Send`. #[must_use] pub struct WorkerFatalError; diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 7f918bd168e..9181f3b51a5 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -479,8 +479,6 @@ fn get_argc_argv<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( } } -pub const CODEGEN_WORKER_ID: usize = usize::MAX; - pub fn codegen_crate<B: ExtraBackendMethods>( backend: B, tcx: TyCtxt<'tcx>, |