New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow extern statics with an extern type #55257

Merged
merged 2 commits into from Oct 28, 2018

Conversation

Projects
None yet
3 participants
@mjbshaw
Contributor

mjbshaw commented Oct 22, 2018

Fixes #55239

@oli-obk

lgtm, just some nits

Show resolved Hide resolved src/librustc_typeck/check/wfcheck.rs Outdated
Show resolved Hide resolved src/librustc_typeck/check/wfcheck.rs Outdated
Show resolved Hide resolved src/librustc_typeck/check/wfcheck.rs Outdated
@mjbshaw

This comment has been minimized.

Contributor

mjbshaw commented Oct 22, 2018

Sorry if I've spammed this thread with comments or resolving nits. The recent GitHub outage is still ongoing and is causing this pull request to have an inconsistent state every time I reload the page, and so I might have duplicated some comments or button pushes. Apologies for the spam.

@oli-obk

This comment has been minimized.

Contributor

oli-obk commented Oct 22, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Oct 22, 2018

📌 Commit 5b84550 has been approved by oli-obk

kennytm added a commit to kennytm/rust that referenced this pull request Oct 24, 2018

Rollup merge of rust-lang#55257 - mjbshaw:static, r=oli-obk
Allow extern statics with an extern type

Fixes rust-lang#55239

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55320 - kennytm:rollup, r=kennytm
Rollup of 22 pull requests

Successful merges:

 - #53507 (Add doc for impl From for Waker)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54965 (update tcp stream documentation)
 - #54977 (Accept `Option<Box<$t:ty>>` in macro argument)
 - #55138 (in which unused-parens suggestions heed what the user actually wrote)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55173 (Suggest appropriate syntax on missing lifetime specifier in return type)
 - #55225 (Move cg_llvm:🔙:linker to cg_utils)
 - #55245 (submodules: update clippy from 5afdf8b7 to b1d03437)
 - #55247 (Clarified code example in char primitive doc)
 - #55251 (Fix a typo in the documentation of RangeInclusive)
 - #55253 (only issue "variant of the expected type" suggestion for enums)
 - #55254 (Correct trailing ellipsis in name_from_pat)
 - #55257 (Allow extern statics with an extern type)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55282 (Remove redundant clone)
 - #55285 (Do some copy editing on the release notes)
 - #55291 (Update stdsimd submodule)
 - #55303 (Update compiler-builtins submodule)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55320 - kennytm:rollup, r=kennytm
Rollup of 28 pull requests

Successful merges:

 - #53507 (Add doc for impl From for Waker)
 - #53931 (Gradually expanding libstd's keyword documentation)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54921 (Add line numbers option to rustdoc)
 - #54965 (update tcp stream documentation)
 - #54977 (Accept `Option<Box<$t:ty>>` in macro argument)
 - #55138 (in which unused-parens suggestions heed what the user actually wrote)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55173 (Suggest appropriate syntax on missing lifetime specifier in return type)
 - #55200 (Documents `From` implementations for `Stdio`)
 - #55225 (Move cg_llvm:🔙:linker to cg_utils)
 - #55245 (submodules: update clippy from 5afdf8b7 to b1d03437)
 - #55247 (Clarified code example in char primitive doc)
 - #55251 (Fix a typo in the documentation of RangeInclusive)
 - #55253 (only issue "variant of the expected type" suggestion for enums)
 - #55254 (Correct trailing ellipsis in name_from_pat)
 - #55257 (Allow extern statics with an extern type)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55282 (Remove redundant clone)
 - #55285 (Do some copy editing on the release notes)
 - #55291 (Update stdsimd submodule)
 - #55296 (Set RUST_BACKTRACE=0 for rustdoc-ui/failed-doctest-output.rs)
 - #55303 (Update compiler-builtins submodule)
 - #55306 (Regression test for #54478.)
 - #55328 (Fix doc for new copysign functions)

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 25, 2018

Rollup merge of rust-lang#55257 - mjbshaw:static, r=oli-obk
Allow extern statics with an extern type

Fixes rust-lang#55239

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55357 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests

Successful merges:

 - #54490 (Rewrite the `UnconditionalRecursion` lint to use MIR)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`)
 - #54921 (Add line numbers option to rustdoc)
 - #54965 (update tcp stream documentation)
 - #55010 (Add template parameter debuginfo to generic types)
 - #55150 (Do not allow moving out of thread local under ast borrowck)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55221 (Don't emit cannot move errors twice in migrate mode)
 - #55238 (Remove the `alloc_jemalloc` crate)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55257 (Allow extern statics with an extern type)
 - #55269 (fix typos in various places)
 - #55301 (List allowed tokens after macro fragments)
 - #55325 (Fix link to macros chapter)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55357 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests

Successful merges:

 - #54490 (Rewrite the `UnconditionalRecursion` lint to use MIR)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`)
 - #54921 (Add line numbers option to rustdoc)
 - #54965 (update tcp stream documentation)
 - #55010 (Add template parameter debuginfo to generic types)
 - #55150 (Do not allow moving out of thread local under ast borrowck)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55221 (Don't emit cannot move errors twice in migrate mode)
 - #55238 (Remove the `alloc_jemalloc` crate)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55257 (Allow extern statics with an extern type)
 - #55269 (fix typos in various places)
 - #55301 (List allowed tokens after macro fragments)
 - #55325 (Fix link to macros chapter)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Oct 25, 2018

Auto merge of #55357 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests

Successful merges:

 - #54490 (Rewrite the `UnconditionalRecursion` lint to use MIR)
 - #54626 (rustc: Tweak filenames encoded into metadata)
 - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`)
 - #54921 (Add line numbers option to rustdoc)
 - #54965 (update tcp stream documentation)
 - #55010 (Add template parameter debuginfo to generic types)
 - #55150 (Do not allow moving out of thread local under ast borrowck)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55221 (Don't emit cannot move errors twice in migrate mode)
 - #55238 (Remove the `alloc_jemalloc` crate)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55257 (Allow extern statics with an extern type)
 - #55269 (fix typos in various places)
 - #55301 (List allowed tokens after macro fragments)
 - #55325 (Fix link to macros chapter)

Failed merges:

r? @ghost

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 27, 2018

Rollup merge of rust-lang#55257 - mjbshaw:static, r=oli-obk
Allow extern statics with an extern type

Fixes rust-lang#55239

bors added a commit that referenced this pull request Oct 27, 2018

Auto merge of #55425 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 13 pull requests

Successful merges:

 - #54683 (lint reasons (RFC 2883, part 1))
 - #54965 (update tcp stream documentation)
 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics )
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55262 (Change the ICE from #55223 to a hard error)
 - #55269 (fix typos in various places)
 - #55330 (Add support for bound types)
 - #55349 (Move collect_and_partition_mono_items to rustc_mir)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)

Failed merges:

r? @ghost

kennytm added a commit to kennytm/rust that referenced this pull request Oct 28, 2018

Rollup merge of rust-lang#55257 - mjbshaw:static, r=oli-obk
Allow extern statics with an extern type

Fixes rust-lang#55239

bors added a commit that referenced this pull request Oct 28, 2018

Auto merge of #55433 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics)
 - #55191 (Fix sub-variant doc display)
 - #55199 (Impl items have generics)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)
 - #55421 (Add ManuallyDrop::take)

@bors bors merged commit 5b84550 into rust-lang:master Oct 28, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment