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.

Sign up for GitHub

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

Jump to bottom

Remove some unnecessary feature gates #56708

Merged

bors merged 3 commits into rust-lang:master from oli-obk:stability_internal_const_fn

Dec 14, 2018

Contributor

oli-obk commented Dec 11, 2018

fixes #56585

oli-obk added 2 commits

December 11, 2018 10:32


          Remove unnecessary feature gates from const fns

799cadb


          Remove some dead code from sgx

rust-highfive assigned alexcrichton

Collaborator

rust-highfive commented Dec 11, 2018

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive added the S-waiting-on-review label

Contributor

jethrogb commented Dec 11, 2018

Mostly LGTM

For the 2 functions you removed, can you put #[allow(unused)] or #[cfg(false)] instead?

Collaborator

rust-highfive commented Dec 11, 2018

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:1d63d400:start=1544520950345851071,finish=1544520951421633700,duration=1075782629
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:04:12] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[00:04:12] expected success, got: exit code: 101
[00:04:12] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:04:12] Build completed unsuccessfully in 0:00:50
[00:04:12] Makefile:28: recipe for target 'all' failed
[00:04:12] make: *** [all] Error 1

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Contributor Author

oli-obk commented Dec 11, 2018

For the 2 functions you removed, can you put #[allow(unused)] or #[cfg(false)] instead?

Any particular reason? Can't you just git revert 1346619 when you need them?

Contributor

jethrogb commented Dec 11, 2018

Oh I didn't see it was a separate commit. Sure, that works.


          Properly stage new feature gates

5457b19

jethrogb mentioned this pull request

Log analysis error for PR 56708 rust-lang/rust-log-analyzer#25

Open

Member

alexcrichton commented Dec 11, 2018

Contributor

bors commented Dec 11, 2018

📌 Commit 5457b19 has been approved by alexcrichton

bors added S-waiting-on-bors and removed S-waiting-on-review labels

pietroalbini added a commit to pietroalbini/rust that referenced this pull request


          Rollup merge of rust-lang#56708 - oli-obk:stability_internal_const_fn…

31550ff

…, r=alexcrichton

Remove some unnecessary feature gates

fixes rust-lang#56585

cc @jethrogb

pietroalbini mentioned this pull request

Rollup of 13 pull requests #56728

Closed

kennytm added a commit to kennytm/rust that referenced this pull request


          Rollup merge of rust-lang#56708 - oli-obk:stability_internal_const_fn…

3377af6

…, r=alexcrichton

Remove some unnecessary feature gates

fixes rust-lang#56585

cc @jethrogb

kennytm mentioned this pull request

Rollup of 23 pull requests #56743

Closed

kennytm added a commit to kennytm/rust that referenced this pull request


          Rollup merge of rust-lang#56708 - oli-obk:stability_internal_const_fn…

070443b

…, r=alexcrichton

Remove some unnecessary feature gates

fixes rust-lang#56585

cc @jethrogb

kennytm mentioned this pull request

Rollup of 32 pull requests #56775

Closed

kennytm added a commit to kennytm/rust that referenced this pull request


          Rollup merge of rust-lang#56708 - oli-obk:stability_internal_const_fn…

33a94f1

…, r=alexcrichton

Remove some unnecessary feature gates

fixes rust-lang#56585

cc @jethrogb

kennytm mentioned this pull request

Rollup of 36 pull requests #56803

Closed

kennytm added a commit to kennytm/rust that referenced this pull request


          Rollup merge of rust-lang#56708 - oli-obk:stability_internal_const_fn…

27c3631

…, r=alexcrichton

Remove some unnecessary feature gates

fixes rust-lang#56585

cc @jethrogb

This was referenced Dec 14, 2018

Rollup of 14 pull requests #56816

Closed

Rollup of 14 pull requests (first batch) #56818

Merged

bors added a commit that referenced this pull request


          Auto merge of #56818 - kennytm:rollup-2, r=kennytm

Rollup of 14 pull requests (first batch)

Successful merges:

 - #56562 (Update libc version required by rustc)
 - #56609 (Unconditionally emit the target-cpu LLVM attribute.)
 - #56637 (rustdoc: Fix local reexports of proc macros)
 - #56658 (Add non-panicking `maybe_new_parser_from_file` variant)
 - #56695 (Fix irrefutable matches on integer ranges)
 - #56699 (Use a `newtype_index!` within `Symbol`.)
 - #56702 ([self-profiler] Add column for percent of total time)
 - #56708 (Remove some unnecessary feature gates)
 - #56709 (Remove unneeded extra chars to reduce search-index size)
 - #56744 (specialize: remove Boxes used by Children::insert)
 - #56748 (Update panic message to be clearer about env-vars)
 - #56749 (x86: Add the `adx` target feature to whitelist)
 - #56756 (Disable btree pretty-printers on older gdbs)
 - #56789 (rustc: Add an unstable `simd_select_bitmask` intrinsic)

r? @ghost

bors merged commit 5457b19 into rust-lang:master

oli-obk deleted the stability_internal_const_fn branch

June 15, 2020 15:29

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors