FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* #57810

ghost · 2019-01-21T17:59:00Z

…d* [1]

dragonflybsd still uses c_char [2]

[1] https://svnweb.freebsd.org/base/releng/11.2/sys/sys/signal.h?revision=334459&view=markup#l438
[2] https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/signal.h#L339

rust-highfive · 2019-01-21T17:59:03Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @shepmaster (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

shepmaster · 2019-01-21T18:17:54Z

r? @alexcrichton

alexcrichton · 2019-01-22T17:44:35Z

I think this is blocked on rust-lang/libc#1222, so marking as such

fix stack_t on FreeBSD FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* [1] dragonflybsd still uses c_char [2] [1] https://svnweb.freebsd.org/base/releng/11.2/sys/sys/signal.h?revision=334459&view=markup#l438 [2] https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/signal.h#L339 should be committed with rust-lang/rust#57810

gnzlbg · 2019-01-23T15:57:37Z

@MikaelUrankar I've released libc 0.2.48 containing the breaking change committed in rust-lang/libc#1222 , would you mind updating the libc version of rust in this PR to 0.2.48 as well ?

ghost · 2019-01-23T16:35:19Z

@MikaelUrankar I've released libc 0.2.48 containing the breaking change committed in rust-lang/libc#1222 , would you mind updating the libc version of rust in this PR to 0.2.48 as well ?

I don't know how to do that. Is it enough to bump the libc version in src/libstd/Cargo.toml or am I missing something ?

gnzlbg · 2019-01-23T16:42:25Z

Is it enough to bump the libc version in src/libstd/Cargo.toml

Pretty much - I am not sure if this is the only Cargo.toml that must be updated (grep for "libc =" to find all of them).

Once you do this, the Cargo.lock might need to be updated as well. The easiest way to update it is to just execute some ./x.py command after the change (like doing a stage 1 build, that would verify that the update does not break anything), but a cargo update -p libc in the root of the repo should work as well.

For the commit you need to commit both the modified Cargo.toml files and the modified Cargo.lock file. I'm on discord and zulip if you need help.

rust-highfive · 2019-01-23T19:44:42Z

The job x86_64-gnu-llvm-6.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:024047dc:start=1548272480050053777,finish=1548272560443446958,duration=80393393181
$ 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-6.0
---
[00:01:23] 
######################################################################## 100.0%
[00:01:23] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:23]     Updating crates.io index
[00:01:33] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:33] Build completed unsuccessfully in 0:00:24
[00:01:33] Makefile:71: recipe for target 'prepare' failed
[00:01:33] make: *** [prepare] Error 1
[00:01:34] Command failed. Attempt 2/5:
[00:01:34] Command failed. Attempt 2/5:
[00:01:35]     Updating crates.io index
[00:01:35] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:35] Build completed unsuccessfully in 0:00:00
[00:01:35] make: *** [prepare] Error 1
[00:01:35] Makefile:71: recipe for target 'prepare' failed
[00:01:37] Command failed. Attempt 3/5:
[00:01:37] Command failed. Attempt 3/5:
[00:01:37]     Updating crates.io index
[00:01:38] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:38] Build completed unsuccessfully in 0:00:00
[00:01:38] make: *** [prepare] Error 1
[00:01:38] Makefile:71: recipe for target 'prepare' failed
[00:01:41] Command failed. Attempt 4/5:
[00:01:41] Command failed. Attempt 4/5:
[00:01:41]     Updating crates.io index
[00:01:41] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:41] Build completed unsuccessfully in 0:00:00
[00:01:42] Makefile:71: recipe for target 'prepare' failed
[00:01:42] make: *** [prepare] Error 1
[00:01:46] Command failed. Attempt 5/5:
[00:01:46] Command failed. Attempt 5/5:
[00:01:46]     Updating crates.io index
[00:01:46] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:46] Build completed unsuccessfully in 0:00:00
[00:01:46] Makefile:71: recipe for target 'prepare' failed
[00:01:46] make: *** [prepare] Error 1
[00:01:46] The command has failed after 5 attempts.
---
travis_time:end:044804f4:start=1548272678126877160,finish=1548272678132976402,duration=6099242
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:11492e00
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:051e7387
travis_time:start:051e7387
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:06b1d8ce
$ dmesg | grep -i kill

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)

gnzlbg · 2019-01-23T20:00:44Z

So it appears that something in the Cargo.lock still needs updating =/

rust-highfive · 2019-01-24T10:38:52Z

The job x86_64-gnu-llvm-6.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:0641ddee:start=1548326123343679549,finish=1548326197820146930,duration=74476467381
$ 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-6.0
---
[00:01:24] 
######################################################################## 100.0%
[00:01:24] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:24]     Updating crates.io index
[00:01:34] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:34] Build completed unsuccessfully in 0:00:23
[00:01:34] Makefile:71: recipe for target 'prepare' failed
[00:01:34] make: *** [prepare] Error 1
[00:01:35] Command failed. Attempt 2/5:
[00:01:35] Command failed. Attempt 2/5:
[00:01:36] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:36] Build completed unsuccessfully in 0:00:00
[00:01:36] Makefile:71: recipe for target 'prepare' failed
[00:01:36] make: *** [prepare] Error 1
[00:01:38] Command failed. Attempt 3/5:
[00:01:38] Command failed. Attempt 3/5:
[00:01:38] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:38] Build completed unsuccessfully in 0:00:00
[00:01:38] Makefile:71: recipe for target 'prepare' failed
[00:01:38] make: *** [prepare] Error 1
[00:01:41] Command failed. Attempt 4/5:
[00:01:41] Command failed. Attempt 4/5:
[00:01:41] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:41] Build completed unsuccessfully in 0:00:00
[00:01:41] Makefile:71: recipe for target 'prepare' failed
[00:01:41] make: *** [prepare] Error 1
[00:01:45] Command failed. Attempt 5/5:
[00:01:45] Command failed. Attempt 5/5:
[00:01:46] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:46] Build completed unsuccessfully in 0:00:00
[00:01:46] make: *** [prepare] Error 1
[00:01:46] Makefile:71: recipe for target 'prepare' failed
[00:01:46] The command has failed after 5 attempts.
---
travis_time:end:103f4119:start=1548326316952983366,finish=1548326316958397253,duration=5413887
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1dae1798
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:073076de
travis_time:start:073076de
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0098d276
$ dmesg | grep -i kill

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)

ghost · 2019-01-24T10:46:22Z

I'm a bit at a loss here, what needs to be updated? FWIW I can build rust locally with these changes.

alexcrichton · 2019-01-24T15:40:34Z

This may be a merge conflict with master, I'd recommend rebasing and re-running ./x.py build. If that changes Cargo.lock you'll want to commit and include that

rust-highfive · 2019-01-24T18:03:47Z

The job x86_64-gnu-llvm-6.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:102d1004:start=1548352758219525716,finish=1548352830064230300,duration=71844704584
$ 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-6.0
---
#######################################################                   76.6%
######################################################################## 100.0%
[00:02:38] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:38]     Updating crates.io index
[00:02:48] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:48] Build completed unsuccessfully in 0:00:25
[00:02:48] make: *** [prepare] Error 1
[00:02:48] Makefile:71: recipe for target 'prepare' failed
[00:02:49] Command failed. Attempt 2/5:
[00:02:49] Command failed. Attempt 2/5:
[00:02:50] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:50] Build completed unsuccessfully in 0:00:00
[00:02:50] make: *** [prepare] Error 1
[00:02:50] Makefile:71: recipe for target 'prepare' failed
[00:02:52] Command failed. Attempt 3/5:
[00:02:52] Command failed. Attempt 3/5:
[00:02:52] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:52] Build completed unsuccessfully in 0:00:00
[00:02:52] Makefile:71: recipe for target 'prepare' failed
[00:02:52] make: *** [prepare] Error 1
[00:02:55] Command failed. Attempt 4/5:
[00:02:55] Command failed. Attempt 4/5:
[00:02:55] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:55] Build completed unsuccessfully in 0:00:00
[00:02:55] make: *** [prepare] Error 1
[00:02:55] Makefile:71: recipe for target 'prepare' failed
[00:02:59] Command failed. Attempt 5/5:
[00:02:59] Command failed. Attempt 5/5:
[00:03:00] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:00] Build completed unsuccessfully in 0:00:00
[00:03:00] make: *** [prepare] Error 1
[00:03:00] Makefile:71: recipe for target 'prepare' failed
[00:03:00] The command has failed after 5 attempts.
---
travis_time:end:02b59480:start=1548353022460269047,finish=1548353022464989744,duration=4720697
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2806cf52
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1bd6558e
travis_time:start:1bd6558e
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:185b0ba8
$ dmesg | grep -i kill

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)

ghost · 2019-01-24T20:34:56Z

93 commits, 148 files changed? where do they come from?

rust-highfive · 2019-01-27T11:00:41Z

The job x86_64-gnu-llvm-6.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:2674194c:start=1548586675562018706,finish=1548586676523200066,duration=961181360
$ 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-6.0
---
[00:01:58] 
######################################################################## 100.0%
[00:01:58] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:58]     Updating crates.io index
[00:02:09] error: checksum for `libc v0.2.48` changed between lock files
[00:02:09] 
[00:02:09] this could be indicative of a few possible errors:
[00:02:09]     * the lock file is corrupt
[00:02:09]     * the lock file is corrupt
[00:02:09]     * a replacement source in use (e.g. a mirror) returned a different checksum
[00:02:09]     * the source itself may be corrupt in one way or another
[00:02:09] 
[00:02:09] unable to verify that `libc v0.2.48` is the same as when the lockfile was generated
[00:02:09] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:09] Build completed unsuccessfully in 0:00:23
[00:02:09] Makefile:70: recipe for target 'prepare' failed
[00:02:09] make: *** [prepare] Error 1
[00:02:09] make: *** [prepare] Error 1
[00:02:10] Command failed. Attempt 2/5:
[00:02:10] error: checksum for `libc v0.2.48` changed between lock files
[00:02:10] 
[00:02:10] this could be indicative of a few possible errors:
[00:02:10]     * the lock file is corrupt
[00:02:10]     * the lock file is corrupt
[00:02:10]     * a replacement source in use (e.g. a mirror) returned a different checksum
[00:02:10]     * the source itself may be corrupt in one way or another
[00:02:10] 
[00:02:10] unable to verify that `libc v0.2.48` is the same as when the lockfile was generated
[00:02:10] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:10] Build completed unsuccessfully in 0:00:00
[00:02:10] Makefile:70: recipe for target 'prepare' failed
[00:02:10] make: *** [prepare] Error 1
[00:02:10] make: *** [prepare] Error 1
[00:02:12] Command failed. Attempt 3/5:
[00:02:13] error: checksum for `libc v0.2.48` changed between lock files
[00:02:13] 
[00:02:13] this could be indicative of a few possible errors:
[00:02:13]     * the lock file is corrupt
[00:02:13]     * the lock file is corrupt
[00:02:13]     * a replacement source in use (e.g. a mirror) returned a different checksum
[00:02:13]     * the source itself may be corrupt in one way or another
[00:02:13] 
[00:02:13] unable to verify that `libc v0.2.48` is the same as when the lockfile was generated
[00:02:13] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:13] Build completed unsuccessfully in 0:00:00
[00:02:13] Makefile:70: recipe for target 'prepare' failed
[00:02:13] make: *** [prepare] Error 1
[00:02:13] make: *** [prepare] Error 1
[00:02:16] Command failed. Attempt 4/5:
[00:02:16] error: checksum for `libc v0.2.48` changed between lock files
[00:02:16] 
[00:02:16] this could be indicative of a few possible errors:
[00:02:16]     * the lock file is corrupt
[00:02:16]     * the lock file is corrupt
[00:02:16]     * a replacement source in use (e.g. a mirror) returned a different checksum
[00:02:16]     * the source itself may be corrupt in one way or another
[00:02:16] 
[00:02:16] unable to verify that `libc v0.2.48` is the same as when the lockfile was generated
[00:02:16] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:16] Build completed unsuccessfully in 0:00:00
[00:02:16] make: *** [prepare] Error 1
[00:02:16] Makefile:70: recipe for target 'prepare' failed
[00:02:16] Makefile:70: recipe for target 'prepare' failed
[00:02:20] Command failed. Attempt 5/5:
[00:02:20] error: checksum for `libc v0.2.48` changed between lock files
[00:02:20] 
[00:02:20] this could be indicative of a few possible errors:
[00:02:20]     * the lock file is corrupt
[00:02:20]     * the lock file is corrupt
[00:02:20]     * a replacement source in use (e.g. a mirror) returned a different checksum
[00:02:20]     * the source itself may be corrupt in one way or another
[00:02:20] 
[00:02:20] unable to verify that `libc v0.2.48` is the same as when the lockfile was generated
[00:02:20] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:02:20] Build completed unsuccessfully in 0:00:00
[00:02:20] Makefile:70: recipe for target 'prepare' failed
[00:02:20] make: *** [prepare] Error 1
---
travis_time:end:035a7a55:start=1548586832385194847,finish=1548586832390012699,duration=4817852
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0046f3ef
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:004c6b4d
travis_time:start:004c6b4d
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00af7e05
$ dmesg | grep -i kill

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)

kennytm · 2019-02-12T16:13:38Z

rust-lang/libc#1222 has been merged so it should no longer be S-blocked.

Centril · 2019-02-23T05:03:12Z

r? @nagisa

nagisa · 2019-02-23T21:40:13Z

@bors r+ the changes here look fine to me.

@gnzlbg @alexcrichton why are libc versions not following semver and introducing breaking changes with patch-level versions?

kennytm · 2019-03-16T16:35:32Z

@MikaelUrankar This PR introduced several new transitive dependencies to rustc:

autocfg
fuchsia-cprng
rand_jitter
rand_os
rdrand

These must be manually added to a whitelist to pass the tidy check. Or maybe find a way to avoid introducing these dependencies.

rust/src/tools/tidy/src/deps.rs

Lines 51 to 60 in 52e8856

    
           /// Which crates to check against the whitelist? 
        
           const WHITELIST_CRATES: &[CrateVersion<'_>] = &[ 
        
               CrateVersion("rustc", "0.0.0"), 
        
               CrateVersion("rustc_codegen_llvm", "0.0.0"), 
        
           ]; 
        
           /// Whitelist of crates rustc is allowed to depend on. Avoid adding to the list if possible. 
        
           const WHITELIST: &[Crate<'_>] = &[ 
        
               Crate("adler32"), 
        
               Crate("aho-corasick"),

mati865 · 2019-03-16T16:36:56Z

@kennytm @MikaelUrankar this PR upgrades all crates in Cargo.lock but show only upgrade libc.

tesuji · 2019-03-16T16:49:14Z

I did the same change in src/libstd/sys/unix/stack_overflow.rs and do
cargo update -p libc. Cargo.lock only updates libc.
Maybe you could revert change in Cargo.lock to master and do cargo update -p libc again.

ghost · 2019-03-17T13:19:18Z

Is it OK now?

nagisa · 2019-03-17T13:47:17Z

@bors r+ Yeah it is good, thanks!

…

On Sun, Mar 17, 2019, 15:19 MikaelUrankar ***@***.***> wrote: Is it OK now? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#57810 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AApc0tstbDn5nDLz3itCh8PDBtDUXITBks5vXkD1gaJpZM4aLS8g> .

bors · 2019-03-17T13:47:18Z

📌 Commit dce4b35ccba68083e040759d469bc0f0d276c4d5 has been approved by nagisa

bors · 2019-03-18T02:56:30Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout stack_t_bsd (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self stack_t_bsd --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-03-19T03:57:36Z

☔ The latest upstream changes (presumably #59279) made this pull request unmergeable. Please resolve the merge conflicts.

…d* [1] dragonflybsd still uses c_char [2] [1] https://svnweb.freebsd.org/base/releng/11.2/sys/sys/signal.h?revision=334459&view=markup#l438 [2] https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/signal.h#L339

ghost · 2019-03-22T12:21:59Z

Can it be merged quickly?

tesuji · 2019-03-22T12:44:32Z

@MikaelUrankar It has to be approved again. Then go through bors queue: https://buildbot2.rust-lang.org/homu/queue/rust

nagisa · 2019-03-22T12:49:14Z

@bors r+

bors · 2019-03-22T12:49:15Z

📌 Commit 6b766ba has been approved by nagisa

FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* …d* [1] dragonflybsd still uses c_char [2] [1] https://svnweb.freebsd.org/base/releng/11.2/sys/sys/signal.h?revision=334459&view=markup#l438 [2] https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/signal.h#L339

bors · 2019-03-22T14:19:49Z

⌛ Testing commit 6b766ba with merge ed19622...

bors · 2019-03-22T17:33:58Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: nagisa
Pushing ed19622 to master...

rust-highfive assigned shepmaster Jan 21, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 21, 2019

rust-highfive assigned alexcrichton and unassigned shepmaster Jan 21, 2019

ghost mentioned this pull request Jan 22, 2019

fix stack_t on FreeBSD rust-lang/libc#1222

Merged

alexcrichton added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jan 22, 2019

Dylan-DPC-zz removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 11, 2019

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 12, 2019

kennytm changed the title ~~FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a voi…~~ FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* Feb 12, 2019

rust-highfive assigned nagisa and unassigned alexcrichton Feb 23, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 17, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2019

MikaelUrankar added 2 commits March 21, 2019 16:53

Update cargo

6b766ba

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 22, 2019

Mark-Simulacrum mentioned this pull request Mar 22, 2019

Rollup of 22 pull requests #59364

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 22, 2019

bors merged commit 6b766ba into rust-lang:master Mar 22, 2019

This was referenced Mar 22, 2019

Update compiler_builtins to 0.1.7 to get windows/arm fix #58789

Closed

Add dist builder for Armv8-M Baseline and HF #59182

Merged

Update pulldown-cmark version #59349

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* #57810

FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* #57810

ghost commented Jan 21, 2019

rust-highfive commented Jan 21, 2019

shepmaster commented Jan 21, 2019

alexcrichton commented Jan 22, 2019

gnzlbg commented Jan 23, 2019

ghost commented Jan 23, 2019

gnzlbg commented Jan 23, 2019 •

edited

Loading

rust-highfive commented Jan 23, 2019

gnzlbg commented Jan 23, 2019

rust-highfive commented Jan 24, 2019

ghost commented Jan 24, 2019

alexcrichton commented Jan 24, 2019

rust-highfive commented Jan 24, 2019

ghost commented Jan 24, 2019

rust-highfive commented Jan 27, 2019

kennytm commented Feb 12, 2019

Centril commented Feb 23, 2019

nagisa commented Feb 23, 2019

kennytm commented Mar 16, 2019 •

edited

Loading

mati865 commented Mar 16, 2019

tesuji commented Mar 16, 2019

ghost commented Mar 17, 2019

nagisa commented Mar 17, 2019 via email

bors commented Mar 17, 2019

bors commented Mar 18, 2019

bors commented Mar 19, 2019

ghost commented Mar 22, 2019

tesuji commented Mar 22, 2019

nagisa commented Mar 22, 2019

bors commented Mar 22, 2019

bors commented Mar 22, 2019

bors commented Mar 22, 2019

FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* #57810

FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* #57810

Conversation

ghost commented Jan 21, 2019

rust-highfive commented Jan 21, 2019

shepmaster commented Jan 21, 2019

alexcrichton commented Jan 22, 2019

gnzlbg commented Jan 23, 2019

ghost commented Jan 23, 2019

gnzlbg commented Jan 23, 2019 • edited Loading

rust-highfive commented Jan 23, 2019

gnzlbg commented Jan 23, 2019

rust-highfive commented Jan 24, 2019

ghost commented Jan 24, 2019

alexcrichton commented Jan 24, 2019

rust-highfive commented Jan 24, 2019

ghost commented Jan 24, 2019

rust-highfive commented Jan 27, 2019

kennytm commented Feb 12, 2019

Centril commented Feb 23, 2019

nagisa commented Feb 23, 2019

kennytm commented Mar 16, 2019 • edited Loading

mati865 commented Mar 16, 2019

tesuji commented Mar 16, 2019

ghost commented Mar 17, 2019

nagisa commented Mar 17, 2019 via email

bors commented Mar 17, 2019

bors commented Mar 18, 2019

bors commented Mar 19, 2019

ghost commented Mar 22, 2019

tesuji commented Mar 22, 2019

nagisa commented Mar 22, 2019

bors commented Mar 22, 2019

bors commented Mar 22, 2019

bors commented Mar 22, 2019

gnzlbg commented Jan 23, 2019 •

edited

Loading

kennytm commented Mar 16, 2019 •

edited

Loading