Skip to content
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

recursion_limit parsing handles overflows #67272

Merged
merged 1 commit into from Feb 18, 2020
Merged

Conversation

@fisherdarling
Copy link

fisherdarling commented Dec 13, 2019

This PR adds overflow handling to #![recursion_limit] attribute parsing. If parsing the given value results in an IntErrorKind::Overflow, then the recursion_limit is set to usize::max_value().

closes #67265

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 13, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @varkor (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.

@fisherdarling fisherdarling changed the title recursion_limit parsing handles overflows. recursion_limit parsing handles overflows Dec 13, 2019
@hellow554

This comment has been minimized.

Copy link
Contributor

hellow554 commented Dec 13, 2019

Can we add a test for this? Not sure how though.

Copy link
Member

varkor left a comment

We should add a test for this. Other than that, and adding a warning, this change looks good.

src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
@hellow554

This comment has been minimized.

Copy link
Contributor

hellow554 commented Dec 16, 2019

@fisherdarling an introduction to the various test directories and functions can be found at https://rust-lang.github.io/rustc-guide/tests/intro.html
I would suggest using the ui directory. But I'm not sure if you should use a new subdirectory (maybe yes, because you will likely end up with a few files (around 4-ish) and they should be grouped together).

I would add a folder in test/ui called recursion_limit and add a few files (e.g. normal.rs, overflowing.rs, invalid_number.rs, ...) and then let the compiler run it (./x.py test --stage=1 ui/recursion_limit (not entirely sure about the syntax, try a few things)) and then add the .ui files for it (you can generate them by using --bless for your x.py.

@varkor would you do anything different here?

@fisherdarling

This comment has been minimized.

Copy link
Author

fisherdarling commented Dec 16, 2019

@hellow554 This is some good advice, thank you!

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 23, 2019

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

@Dylan-DPC

This comment has been minimized.

Copy link
Member

Dylan-DPC commented Jan 16, 2020

@fisherdarling any updates on this?

@fisherdarling

This comment has been minimized.

Copy link
Author

fisherdarling commented Jan 16, 2020

@Dylan-DPC Currently starting a new semester, I'm planning on getting an update out this weekend!

src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
@fisherdarling

This comment has been minimized.

Copy link
Author

fisherdarling commented Jan 20, 2020

@Dylan-DPC Ready for any comments

Copy link
Member

varkor left a comment

Thanks for adding the tests, @fisherdarling! Just a few comments.

src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
@joelpalmer

This comment has been minimized.

Copy link

joelpalmer commented Jan 27, 2020

Ping from Triage: any updates @fisherdarling?

@fisherdarling

This comment has been minimized.

Copy link
Author

fisherdarling commented Jan 27, 2020

@joelpalmer Thanks for checking in. I'll get an update out tonight

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 2, 2020

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-02-02T04:47:27.3030295Z ========================== Starting Command Output ===========================
2020-02-02T04:47:27.3032112Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/b7d1e03b-7903-4280-a99e-8c485e70bcf1.sh
2020-02-02T04:47:27.3032149Z 
2020-02-02T04:47:27.3210844Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-02T04:47:27.3216724Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-02T04:47:27.3218575Z Task         : Get sources
2020-02-02T04:47:27.3218605Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-02T04:47:27.3218635Z Version      : 1.0.0
2020-02-02T04:47:27.3218710Z Author       : Microsoft
---
2020-02-02T04:47:28.2979675Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-02T04:47:28.2989988Z ##[command]git config gc.auto 0
2020-02-02T04:47:28.2992753Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-02T04:47:28.2994668Z ##[command]git config --get-all http.proxy
2020-02-02T04:47:28.2999985Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67272/merge:refs/remotes/pull/67272/merge
---
2020-02-02T05:34:54.0086217Z .................................................................................................... 1700/9567
2020-02-02T05:34:57.9430393Z .................................................................................................... 1800/9567
2020-02-02T05:35:08.4377921Z .........................i.......................................................................... 1900/9567
2020-02-02T05:35:14.1610571Z .................................................................................................... 2000/9567
2020-02-02T05:35:26.4711677Z ...............iiiii................................................................................ 2100/9567
2020-02-02T05:35:34.6094671Z .................................................................................................... 2300/9567
2020-02-02T05:35:36.5228498Z .................................................................................................... 2400/9567
2020-02-02T05:35:40.5959363Z .................................................................................................... 2500/9567
2020-02-02T05:35:58.0204437Z .................................................................................................... 2600/9567
---
2020-02-02T05:38:09.5527720Z .................................................................................................... 4800/9567
2020-02-02T05:38:13.7189990Z ..........................................................i...............i......................... 4900/9567
2020-02-02T05:38:20.5295214Z .................................................................................................... 5000/9567
2020-02-02T05:38:26.9704882Z .................................................................................................... 5100/9567
2020-02-02T05:38:31.0300777Z .i.................................................................................................. 5200/9567
2020-02-02T05:38:40.0328956Z ...........................................................................ii.ii........i...i....... 5300/9567
2020-02-02T05:38:47.1754318Z .............i...................................................................................... 5500/9567
2020-02-02T05:38:55.3855740Z .................................................................................................... 5600/9567
2020-02-02T05:39:00.7860252Z ..............................................................i..................................... 5700/9567
2020-02-02T05:39:06.9982778Z .................................................................................................... 5800/9567
2020-02-02T05:39:06.9982778Z .................................................................................................... 5800/9567
2020-02-02T05:39:13.5715845Z .................................................................................................... 5900/9567
2020-02-02T05:39:21.0408939Z .....................................................ii...i..ii...........i......................... 6000/9567
2020-02-02T05:39:39.1890940Z .................................................................................................... 6200/9567
2020-02-02T05:39:46.0866625Z .................................................................................................... 6300/9567
2020-02-02T05:39:46.0866625Z .................................................................................................... 6300/9567
2020-02-02T05:39:52.9134414Z .................................................................................i..ii.............. 6400/9567
2020-02-02T05:40:16.8862245Z .................................................................................................... 6600/9567
2020-02-02T05:40:21.4828131Z .........................................................i.......................................... 6700/9567
2020-02-02T05:40:23.3216458Z .................................................................................................... 6800/9567
2020-02-02T05:40:25.2850744Z ..........................................................i......................................... 6900/9567
---
2020-02-02T05:41:48.7199188Z .................................................................................................... 7600/9567
2020-02-02T05:41:52.9269922Z .................................................................................................... 7700/9567
2020-02-02T05:41:58.7591768Z .................................................................................................... 7800/9567
2020-02-02T05:42:07.8748716Z .................................................................................................... 7900/9567
2020-02-02T05:42:13.1397506Z ....................iiiiiii.i....................................................................... 8000/9567
2020-02-02T05:42:25.3392782Z .................................................................................................... 8200/9567
2020-02-02T05:42:33.1830744Z .................................................................................................... 8300/9567
2020-02-02T05:42:44.5800763Z .................................................................................................... 8400/9567
2020-02-02T05:42:50.6072971Z .................................................................................................... 8500/9567
---
2020-02-02T05:44:27.0519906Z 4 LL | test!(test);
2020-02-02T05:44:27.0520006Z 
2020-02-02T05:44:27.0520124Z 
2020-02-02T05:44:27.0520244Z The actual stderr differed from the expected stderr.
2020-02-02T05:44:27.0520601Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero/zero.stderr
2020-02-02T05:44:27.0521332Z To update references, rerun the tests and pass the `--bless` flag
2020-02-02T05:44:27.0521688Z To only update this specific test, also pass `--test-args recursion_limit/zero.rs`
2020-02-02T05:44:27.0521952Z error: 1 errors occurred comparing output.
2020-02-02T05:44:27.0522065Z status: exit code: 1
2020-02-02T05:44:27.0522065Z status: exit code: 1
2020-02-02T05:44:27.0522843Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/recursion_limit/zero.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero/auxiliary" "-A" "unused"
2020-02-02T05:44:27.0523336Z ------------------------------------------
2020-02-02T05:44:27.0523461Z 
2020-02-02T05:44:27.0523740Z ------------------------------------------
2020-02-02T05:44:27.0523893Z stderr:
2020-02-02T05:44:27.0523893Z stderr:
2020-02-02T05:44:27.0524165Z ------------------------------------------
2020-02-02T05:44:27.0524322Z error: recursion limit reached while expanding `test!`
2020-02-02T05:44:27.0524799Z   --> /checkout/src/test/ui/recursion_limit/zero.rs:10:1
2020-02-02T05:44:27.0524938Z    |
2020-02-02T05:44:27.0525082Z LL | test!(test); //~ ERROR 10:1: 10:13: recursion limit reached while expanding the macro `test`
2020-02-02T05:44:27.0525309Z    |
2020-02-02T05:44:27.0525309Z    |
2020-02-02T05:44:27.0525436Z    = help: consider adding a `#![recursion_limit="0"]` attribute to your crate
2020-02-02T05:44:27.0525640Z error: aborting due to previous error
2020-02-02T05:44:27.0525751Z 
2020-02-02T05:44:27.0525846Z 
2020-02-02T05:44:27.0526135Z ------------------------------------------
---
2020-02-02T05:44:27.0535266Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-02T05:44:27.0535477Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-02T05:44:27.0544380Z 
2020-02-02T05:44:27.0545891Z 
2020-02-02T05:44:27.0548003Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-02T05:44:27.0549760Z 
2020-02-02T05:44:27.0549788Z 
2020-02-02T05:44:27.0564099Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-02T05:44:27.0564160Z Build completed unsuccessfully in 0:52:02
2020-02-02T05:44:27.0564160Z Build completed unsuccessfully in 0:52:02
2020-02-02T05:44:27.0616362Z == clock drift check ==
2020-02-02T05:44:27.6420240Z   local time: Sun Feb  2 05:44:27 UTC 2020
2020-02-02T05:44:27.6420833Z   network time: Sun, 02 Feb 2020 05:44:27 GMT
2020-02-02T05:44:27.6420983Z == end clock drift check ==
2020-02-02T05:44:27.7990996Z 
2020-02-02T05:44:27.8072186Z ##[error]Bash exited with code '1'.
2020-02-02T05:44:27.8104012Z ##[section]Finishing: Run build
2020-02-02T05:44:27.8134431Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-02T05:44:27.8135943Z Task         : Get sources
2020-02-02T05:44:27.8135992Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-02T05:44:27.8136043Z Version      : 1.0.0
2020-02-02T05:44:27.8136074Z Author       : Microsoft
2020-02-02T05:44:27.8136074Z Author       : Microsoft
2020-02-02T05:44:27.8136108Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-02T05:44:27.8136163Z ==============================================================================
2020-02-02T05:44:28.2129581Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-02T05:44:28.2170687Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-02T05:44:28.2264444Z Cleaning up task key
2020-02-02T05:44:28.2265096Z Start cleaning up orphan processes.
2020-02-02T05:44:28.2362059Z Terminate orphan process: pid (3574) (python)
2020-02-02T05:44:28.2611407Z ##[section]Finishing: Finalize Job

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)

@varkor

This comment has been minimized.

Copy link
Member

varkor commented Feb 3, 2020

@fisherdarling: thanks! Could you squash your commits together? We avoid merge commits in the Rust repo.

@fisherdarling fisherdarling force-pushed the fisherdarling:master branch 2 times, most recently from b0c61ea to 03922e3 Feb 4, 2020
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 4, 2020

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-02-04T07:23:38.9951774Z ========================== Starting Command Output ===========================
2020-02-04T07:23:38.9954619Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/525878a4-f6a0-4f83-a711-9a1fb7dd6b0e.sh
2020-02-04T07:23:38.9954885Z 
2020-02-04T07:23:38.9958475Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-04T07:23:38.9965915Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T07:23:38.9967824Z Task         : Get sources
2020-02-04T07:23:38.9967863Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-04T07:23:38.9967901Z Version      : 1.0.0
2020-02-04T07:23:38.9967938Z Author       : Microsoft
---
2020-02-04T07:23:40.0953494Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-04T07:23:40.1062251Z ##[command]git config gc.auto 0
2020-02-04T07:23:40.1150471Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-04T07:23:40.1260782Z ##[command]git config --get-all http.proxy
2020-02-04T07:23:40.1387643Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67272/merge:refs/remotes/pull/67272/merge
---
2020-02-04T07:29:10.1440962Z    Compiling serde_json v1.0.40
2020-02-04T07:29:11.8915846Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2020-02-04T07:29:22.5569870Z     Finished release [optimized] target(s) in 1m 26s
2020-02-04T07:29:22.5697227Z tidy check
2020-02-04T07:29:23.3189297Z tidy error: /checkout/src/test/ui/recursion_limit/overflow.rs:3: line longer than 100 chars
2020-02-04T07:29:25.4810383Z some tidy checks failed
2020-02-04T07:29:25.4810493Z Found 487 error codes
2020-02-04T07:29:25.4810545Z Found 0 error codes with no tests
2020-02-04T07:29:25.4810638Z Done!
2020-02-04T07:29:25.4810638Z Done!
2020-02-04T07:29:25.4823037Z 
2020-02-04T07:29:25.4823165Z 
2020-02-04T07:29:25.4824273Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2020-02-04T07:29:25.4824431Z 
2020-02-04T07:29:25.4824494Z 
2020-02-04T07:29:25.4828999Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2020-02-04T07:29:25.4829270Z Build completed unsuccessfully in 0:01:37
2020-02-04T07:29:25.4829270Z Build completed unsuccessfully in 0:01:37
2020-02-04T07:29:25.4901497Z == clock drift check ==
2020-02-04T07:29:25.4912456Z   local time: Tue Feb  4 07:29:25 UTC 2020
2020-02-04T07:29:25.7831982Z   network time: Tue, 04 Feb 2020 07:29:25 GMT
2020-02-04T07:29:25.7833564Z == end clock drift check ==
2020-02-04T07:29:26.4913578Z 
2020-02-04T07:29:26.5030969Z ##[error]Bash exited with code '1'.
2020-02-04T07:29:26.5061623Z ##[section]Finishing: Run build
2020-02-04T07:29:26.5077949Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T07:29:26.5080420Z Task         : Get sources
2020-02-04T07:29:26.5080474Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-04T07:29:26.5080545Z Version      : 1.0.0
2020-02-04T07:29:26.5080593Z Author       : Microsoft
2020-02-04T07:29:26.5080593Z Author       : Microsoft
2020-02-04T07:29:26.5080646Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-04T07:29:26.5080724Z ==============================================================================
2020-02-04T07:29:26.9647445Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-04T07:29:26.9699288Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T07:29:26.9833912Z Cleaning up task key
2020-02-04T07:29:26.9835012Z Start cleaning up orphan processes.
2020-02-04T07:29:26.9984618Z Terminate orphan process: pid (4367) (python)
2020-02-04T07:29:27.0204208Z ##[section]Finishing: Finalize Job

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)

@fisherdarling fisherdarling force-pushed the fisherdarling:master branch from 03922e3 to 309689e Feb 4, 2020
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 4, 2020

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-02-04T07:52:51.2875223Z ========================== Starting Command Output ===========================
2020-02-04T07:52:51.2876887Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/2ab4636b-88e1-4c3c-aeb7-844ade30b73f.sh
2020-02-04T07:52:51.2876921Z 
2020-02-04T07:52:51.2879269Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-04T07:52:51.2884231Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T07:52:51.2885511Z Task         : Get sources
2020-02-04T07:52:51.2885538Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-04T07:52:51.2885563Z Version      : 1.0.0
2020-02-04T07:52:51.2885587Z Author       : Microsoft
---
2020-02-04T07:52:52.2639355Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-04T07:52:52.2649850Z ##[command]git config gc.auto 0
2020-02-04T07:52:52.2651898Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-04T07:52:52.2653673Z ##[command]git config --get-all http.proxy
2020-02-04T07:52:52.2659020Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67272/merge:refs/remotes/pull/67272/merge
---
2020-02-04T08:46:33.8556649Z .................................................................................................... 1700/9586
2020-02-04T08:46:38.6200846Z .................................................................................................... 1800/9586
2020-02-04T08:46:50.4502762Z ............................i....................................................................... 1900/9586
2020-02-04T08:46:57.4742442Z .................................................................................................... 2000/9586
2020-02-04T08:47:11.1588298Z ..................iiiii............................................................................. 2100/9586
2020-02-04T08:47:20.3981051Z .................................................................................................... 2300/9586
2020-02-04T08:47:22.7039711Z .................................................................................................... 2400/9586
2020-02-04T08:47:27.0767225Z .................................................................................................... 2500/9586
2020-02-04T08:47:46.8575946Z .................................................................................................... 2600/9586
---
2020-02-04T08:50:15.9331173Z .............................................................i...............i...................... 4900/9586
2020-02-04T08:50:23.3068993Z .................................................................................................... 5000/9586
2020-02-04T08:50:30.9280968Z .................................................................................................... 5100/9586
2020-02-04T08:50:35.3557714Z ....i............................................................................................... 5200/9586
2020-02-04T08:50:45.7321050Z ..............................................................................ii.ii........i...i.... 5300/9586
2020-02-04T08:50:53.4513090Z ................i................................................................................... 5500/9586
2020-02-04T08:51:01.7966790Z .................................................................................................... 5600/9586
2020-02-04T08:51:07.9556540Z .................................................................i.................................. 5700/9586
2020-02-04T08:51:14.5898829Z .................................................................................................... 5800/9586
2020-02-04T08:51:14.5898829Z .................................................................................................... 5800/9586
2020-02-04T08:51:21.5750809Z .................................................................................................... 5900/9586
2020-02-04T08:51:30.2367008Z ........................................................ii...i..ii...........i...................... 6000/9586
2020-02-04T08:51:50.2542197Z .................................................................................................... 6200/9586
2020-02-04T08:51:57.5818805Z .................................................................................................... 6300/9586
2020-02-04T08:51:57.5818805Z .................................................................................................... 6300/9586
2020-02-04T08:52:05.3748935Z ....................................................................................i..ii........... 6400/9586
2020-02-04T08:52:27.0824546Z .................................................................................................... 6600/9586
2020-02-04T08:52:35.5363955Z .......................................................................i............................ 6700/9586
2020-02-04T08:52:37.5363203Z .................................................................................................... 6800/9586
2020-02-04T08:52:39.5036533Z .........................................................................i.......................... 6900/9586
---
2020-02-04T08:54:15.5894729Z .................................................................................................... 7600/9586
2020-02-04T08:54:20.0751331Z .................................................................................................... 7700/9586
2020-02-04T08:54:26.3287261Z .................................................................................................... 7800/9586
2020-02-04T08:54:34.2706735Z .................................................................................................... 7900/9586
2020-02-04T08:54:41.2486176Z .......................................iiiiiiii..................................................... 8000/9586
2020-02-04T08:54:55.7302832Z .................................................................................................... 8200/9586
2020-02-04T08:55:02.2384277Z .................................................................................................... 8300/9586
2020-02-04T08:55:16.9328163Z .................................................................................................... 8400/9586
2020-02-04T08:55:23.9487459Z .................................................................................................... 8500/9586
---
2020-02-04T08:57:10.3431366Z 
2020-02-04T08:57:10.3432356Z ---- [ui] ui/recursion_limit/overflow.rs stdout ----
2020-02-04T08:57:10.3432438Z diff of stderr:
2020-02-04T08:57:10.3432504Z 
2020-02-04T08:57:10.3432958Z 1 error: `recursion_limit` must be a non-negative integer
2020-02-04T08:57:10.3433279Z 3    |
2020-02-04T08:57:10.3433279Z 3    |
2020-02-04T08:57:10.3433492Z - LL | #![recursion_limit = "999999999999999999999999"] 
2020-02-04T08:57:10.3433538Z + LL | #![recursion_limit = "999999999999999999999999"]
2020-02-04T08:57:10.3433798Z 6    |                      |
2020-02-04T08:57:10.3433798Z 6    |                      |
2020-02-04T08:57:10.3433841Z 7    |                      `recursion_limit` is too large
2020-02-04T08:57:10.3433909Z 
2020-02-04T08:57:10.3433948Z The actual stderr differed from the expected stderr.
2020-02-04T08:57:10.3434591Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/overflow/overflow.stderr
2020-02-04T08:57:10.3434591Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/overflow/overflow.stderr
2020-02-04T08:57:10.3434826Z To update references, rerun the tests and pass the `--bless` flag
2020-02-04T08:57:10.3435095Z To only update this specific test, also pass `--test-args recursion_limit/overflow.rs`
2020-02-04T08:57:10.3435187Z error: 1 errors occurred comparing output.
2020-02-04T08:57:10.3435228Z status: exit code: 1
2020-02-04T08:57:10.3435228Z status: exit code: 1
2020-02-04T08:57:10.3435953Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/recursion_limit/overflow.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/overflow" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/overflow/auxiliary" "-A" "unused"
2020-02-04T08:57:10.3436264Z ------------------------------------------
2020-02-04T08:57:10.3436311Z 
2020-02-04T08:57:10.3436659Z ------------------------------------------
2020-02-04T08:57:10.3436704Z stderr:
2020-02-04T08:57:10.3436704Z stderr:
2020-02-04T08:57:10.3436896Z ------------------------------------------
2020-02-04T08:57:10.3437441Z error: `recursion_limit` must be a non-negative integer
2020-02-04T08:57:10.3437650Z   --> /checkout/src/test/ui/recursion_limit/overflow.rs:3:1
2020-02-04T08:57:10.3437751Z LL | #![recursion_limit = "999999999999999999999999"]
2020-02-04T08:57:10.3437951Z    | ^^^^^^^^^^^^^^^^^^^^^--------------------------^
2020-02-04T08:57:10.3437995Z    |                      |
2020-02-04T08:57:10.3437995Z    |                      |
2020-02-04T08:57:10.3438055Z    |                      `recursion_limit` is too large
2020-02-04T08:57:10.3438126Z error: aborting due to previous error
2020-02-04T08:57:10.3438152Z 
2020-02-04T08:57:10.3438198Z 
2020-02-04T08:57:10.3438392Z ------------------------------------------
---
2020-02-04T08:57:10.3465462Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-04T08:57:10.3465743Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-04T08:57:10.3476458Z 
2020-02-04T08:57:10.3476667Z 
2020-02-04T08:57:10.3481505Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-04T08:57:10.3482116Z 
2020-02-04T08:57:10.3482430Z 
2020-02-04T08:57:10.3485020Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-04T08:57:10.3485309Z Build completed unsuccessfully in 0:58:34
2020-02-04T08:57:10.3485309Z Build completed unsuccessfully in 0:58:34
2020-02-04T08:57:10.3536745Z == clock drift check ==
2020-02-04T08:57:10.3550955Z   local time: Tue Feb  4 08:57:10 UTC 2020
2020-02-04T08:57:10.6470113Z   network time: Tue, 04 Feb 2020 08:57:10 GMT
2020-02-04T08:57:10.6472583Z == end clock drift check ==
2020-02-04T08:57:11.1599443Z 
2020-02-04T08:57:11.1669040Z ##[error]Bash exited with code '1'.
2020-02-04T08:57:11.1696017Z ##[section]Finishing: Run build
2020-02-04T08:57:11.1717774Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T08:57:11.1719427Z Task         : Get sources
2020-02-04T08:57:11.1719466Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-04T08:57:11.1719520Z Version      : 1.0.0
2020-02-04T08:57:11.1719555Z Author       : Microsoft
2020-02-04T08:57:11.1719555Z Author       : Microsoft
2020-02-04T08:57:11.1719594Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-04T08:57:11.1719653Z ==============================================================================
2020-02-04T08:57:11.5603882Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-04T08:57:11.5638545Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-04T08:57:11.5734582Z Cleaning up task key
2020-02-04T08:57:11.5735196Z Start cleaning up orphan processes.
2020-02-04T08:57:11.5828399Z Terminate orphan process: pid (5392) (python)
2020-02-04T08:57:11.6055695Z ##[section]Finishing: Finalize Job

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)

@fisherdarling fisherdarling force-pushed the fisherdarling:master branch from 309689e to 3102780 Feb 5, 2020
Copy link
Member

varkor left a comment

Sorry for taking a while to review this again. I spotted one last thing — but after this, everything looks good! (Something seems to have happened to the committer information when you rebased, as you're listed twice, but only one is linked with your GitHub account, which you might want to look at, but it's not a big problem.)

src/librustc/middle/recursion_limit.rs Outdated Show resolved Hide resolved
@JohnCSimon

This comment has been minimized.

Copy link
Member

JohnCSimon commented Feb 16, 2020

Ping from triage: @fisherdarling - can you please address the comments and changes from varkor?
thanks.

@fisherdarling fisherdarling force-pushed the fisherdarling:master branch from 3102780 to d27b4af Feb 16, 2020
@fisherdarling

This comment has been minimized.

Copy link
Author

fisherdarling commented Feb 16, 2020

@varkor Finished up! I hope it looks good now. Thanks for all of the help! Apologies for my delay in getting this wrapped up.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 16, 2020

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-02-16T06:57:53.0406565Z ========================== Starting Command Output ===========================
2020-02-16T06:57:53.0410518Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/a30af605-ab9a-4be0-95e8-36e627f5e5e6.sh
2020-02-16T06:57:53.0410707Z 
2020-02-16T06:57:53.0415093Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-16T06:57:53.0423927Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-16T06:57:53.0425786Z Task         : Get sources
2020-02-16T06:57:53.0425831Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-16T06:57:53.0425932Z Version      : 1.0.0
2020-02-16T06:57:53.0425979Z Author       : Microsoft
---
2020-02-16T06:57:58.2089077Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-16T06:57:58.2266953Z ##[command]git config gc.auto 0
2020-02-16T06:57:58.2339540Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-16T06:57:58.2384956Z ##[command]git config --get-all http.proxy
2020-02-16T06:57:58.2501230Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67272/merge:refs/remotes/pull/67272/merge
---
2020-02-16T07:47:39.2809183Z .................................................................................................... 1700/9654
2020-02-16T07:47:43.2562247Z .................................................................................................... 1800/9654
2020-02-16T07:47:52.8791982Z ..................................i................................................................. 1900/9654
2020-02-16T07:47:59.0713832Z .................................................................................................... 2000/9654
2020-02-16T07:48:10.4871827Z ........................iiiii....................................................................... 2100/9654
2020-02-16T07:48:18.6102131Z .................................................................................................... 2300/9654
2020-02-16T07:48:20.7239814Z .................................................................................................... 2400/9654
2020-02-16T07:48:24.6496656Z .................................................................................................... 2500/9654
2020-02-16T07:48:41.3938429Z .................................................................................................... 2600/9654
---
2020-02-16T07:51:25.3082868Z .................................................................................................... 5600/9654
2020-02-16T07:51:33.7336821Z .......................................................................................i............ 5700/9654
2020-02-16T07:51:40.1704941Z .................................................................................................... 5800/9654
2020-02-16T07:51:44.4555335Z .....................................................................................i.............. 5900/9654
2020-02-16T07:51:52.4323195Z ...............................................................................ii...i..ii........... 6000/9654
2020-02-16T07:52:02.8986992Z i................................................................................................... 6100/9654
2020-02-16T07:52:15.2203814Z .................................................................................................... 6300/9654
2020-02-16T07:52:18.5360803Z .................................................................................................... 6400/9654
2020-02-16T07:52:18.5360803Z .................................................................................................... 6400/9654
2020-02-16T07:52:29.2337382Z .......i..ii........................................................................................ 6500/9654
2020-02-16T07:52:45.5370857Z ...............................................................................................i.... 6700/9654
2020-02-16T07:52:47.3869413Z .................................................................................................... 6800/9654
2020-02-16T07:52:49.1145018Z .................................................................................................... 6900/9654
2020-02-16T07:52:51.1291165Z .....i.............................................................................................. 7000/9654
---
2020-02-16T07:54:08.0516031Z .................................................................................................... 7600/9654
2020-02-16T07:54:12.3111810Z .................................................................................................... 7700/9654
2020-02-16T07:54:17.3451602Z .................................................................................................... 7800/9654
2020-02-16T07:54:22.5617101Z .................................................................................................... 7900/9654
2020-02-16T07:54:30.6439560Z ...........................................................................................iiiiiii.i 8000/9654
2020-02-16T07:54:43.6549232Z ...............................i......i............................................................. 8200/9654
2020-02-16T07:54:47.7315000Z .................................................................................................... 8300/9654
2020-02-16T07:54:56.9348488Z .................................................................................................... 8400/9654
2020-02-16T07:55:06.6637677Z .................................................................................................... 8500/9654
---
2020-02-16T07:56:42.2543632Z 
2020-02-16T07:56:42.2543736Z 4 LL | test!(test);
2020-02-16T07:56:42.2543854Z 5    | ^^^^^^^^^^^^
2020-02-16T07:56:42.2543956Z 6    |
2020-02-16T07:56:42.2544237Z -    = help: consider adding a `#![recursion_limit="0"]` attribute to your crate
2020-02-16T07:56:42.2544382Z +    = help: consider adding a `#![recursion_limit="0"]` attribute to your crate (`zero`)
2020-02-16T07:56:42.2544605Z 9 error: aborting due to previous error
2020-02-16T07:56:42.2544703Z 10 
2020-02-16T07:56:42.2544790Z 
2020-02-16T07:56:42.2544882Z 
2020-02-16T07:56:42.2544882Z 
2020-02-16T07:56:42.2545020Z The actual stderr differed from the expected stderr.
2020-02-16T07:56:42.2545315Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero/zero.stderr
2020-02-16T07:56:42.2545595Z To update references, rerun the tests and pass the `--bless` flag
2020-02-16T07:56:42.2545866Z To only update this specific test, also pass `--test-args recursion_limit/zero.rs`
2020-02-16T07:56:42.2546094Z error: 1 errors occurred comparing output.
2020-02-16T07:56:42.2546195Z status: exit code: 1
2020-02-16T07:56:42.2546195Z status: exit code: 1
2020-02-16T07:56:42.2546965Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/recursion_limit/zero.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/recursion_limit/zero/auxiliary" "-A" "unused"
2020-02-16T07:56:42.2547400Z ------------------------------------------
2020-02-16T07:56:42.2547502Z 
2020-02-16T07:56:42.2547830Z ------------------------------------------
2020-02-16T07:56:42.2547958Z stderr:
2020-02-16T07:56:42.2547958Z stderr:
2020-02-16T07:56:42.2548187Z ------------------------------------------
2020-02-16T07:56:42.2548304Z error: recursion limit reached while expanding `test!`
2020-02-16T07:56:42.2548563Z   --> /checkout/src/test/ui/recursion_limit/zero.rs:10:1
2020-02-16T07:56:42.2548680Z    |
2020-02-16T07:56:42.2548788Z LL | test!(test); //~ ERROR 10:1: 10:13: recursion limit reached while expanding `test!`
2020-02-16T07:56:42.2549010Z    |
2020-02-16T07:56:42.2549010Z    |
2020-02-16T07:56:42.2549137Z    = help: consider adding a `#![recursion_limit="0"]` attribute to your crate (`zero`)
2020-02-16T07:56:42.2549331Z error: aborting due to previous error
2020-02-16T07:56:42.2549417Z 
2020-02-16T07:56:42.2549518Z 
2020-02-16T07:56:42.2549749Z ------------------------------------------
---
2020-02-16T07:56:42.2563476Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-16T07:56:42.2563760Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-16T07:56:42.2575214Z 
2020-02-16T07:56:42.2575373Z 
2020-02-16T07:56:42.2579407Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-16T07:56:42.2579869Z 
2020-02-16T07:56:42.2579897Z 
2020-02-16T07:56:43.0245864Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-16T07:56:43.0251346Z Build completed unsuccessfully in 0:52:25
2020-02-16T07:56:43.0251346Z Build completed unsuccessfully in 0:52:25
2020-02-16T07:56:43.0265632Z == clock drift check ==
2020-02-16T07:56:43.0265764Z   local time: Sun Feb 16 07:56:42 UTC 2020
2020-02-16T07:56:43.0265838Z   network time: Sun, 16 Feb 2020 07:56:42 GMT
2020-02-16T07:56:43.0266002Z == end clock drift check ==
2020-02-16T07:56:43.0890350Z 
2020-02-16T07:56:43.0958590Z ##[error]Bash exited with code '1'.
2020-02-16T07:56:43.0967899Z ##[section]Finishing: Run build
2020-02-16T07:56:43.0987091Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-16T07:56:43.0988603Z Task         : Get sources
2020-02-16T07:56:43.0988645Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-16T07:56:43.0988685Z Version      : 1.0.0
2020-02-16T07:56:43.0988739Z Author       : Microsoft
2020-02-16T07:56:43.0988739Z Author       : Microsoft
2020-02-16T07:56:43.0988875Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-16T07:56:43.0988919Z ==============================================================================
2020-02-16T07:56:43.4317757Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-16T07:56:43.4369379Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67272/merge to s
2020-02-16T07:56:43.4481225Z Cleaning up task key
2020-02-16T07:56:43.4481933Z Start cleaning up orphan processes.
2020-02-16T07:56:43.4552920Z Terminate orphan process: pid (4186) (python)
2020-02-16T07:56:43.5161493Z ##[section]Finishing: Finalize Job

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)

@hellow554

This comment has been minimized.

Copy link
Contributor

hellow554 commented Feb 16, 2020

the .stderr file must be updated. You can do that with the --bless flag to x.py

@fisherdarling fisherdarling force-pushed the fisherdarling:master branch from f9e1531 to c53693d Feb 17, 2020
@hellow554

This comment has been minimized.

Copy link
Contributor

hellow554 commented Feb 17, 2020

After two months I think we're done.

@varkor any last concerns?

@varkor

This comment has been minimized.

Copy link
Member

varkor commented Feb 17, 2020

@fisherdarling: thanks for bearing with all the comments! This looks good to go now!
And thanks @hellow554 for helping with the review.

@bors r=varkor,hellow554 rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 17, 2020

📌 Commit c53693d has been approved by varkor,hellow554

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 17, 2020
…ow554

recursion_limit parsing handles overflows

This PR adds overflow handling to `#![recursion_limit]` attribute parsing. If parsing the given value results in an `IntErrorKind::Overflow`, then the recursion_limit is set to `usize::max_value()`.

closes rust-lang#67265
bors added a commit that referenced this pull request Feb 17, 2020
Rollup of 5 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Feb 17, 2020
Rollup of 5 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
…ow554

recursion_limit parsing handles overflows

This PR adds overflow handling to `#![recursion_limit]` attribute parsing. If parsing the given value results in an `IntErrorKind::Overflow`, then the recursion_limit is set to `usize::max_value()`.

closes rust-lang#67265
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 8 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)
 - #69244 (configure: set LLVM flags with a value)
 - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
 - #69252 (Clean out unused directories for extra disk space)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 8 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)
 - #69244 (configure: set LLVM flags with a value)
 - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
 - #69252 (Clean out unused directories for extra disk space)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
…ow554

recursion_limit parsing handles overflows

This PR adds overflow handling to `#![recursion_limit]` attribute parsing. If parsing the given value results in an `IntErrorKind::Overflow`, then the recursion_limit is set to `usize::max_value()`.

closes rust-lang#67265
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 8 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)
 - #69244 (configure: set LLVM flags with a value)
 - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
 - #69252 (Clean out unused directories for extra disk space)

Failed merges:

r? @ghost
@bors bors merged commit c53693d into rust-lang:master Feb 18, 2020
4 checks passed
4 checks passed
pr Build #20200217.4 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

You can’t perform that action at this time.