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

Impl Debug for Chars #63000

Merged
merged 2 commits into from Jul 30, 2019

Conversation

@max-sixty
Copy link
Contributor

commented Jul 26, 2019

Closes #62947, making Debug more consistent with the struct's output and purpose

Let me know any feedback!

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jul 26, 2019

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

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Jul 26, 2019

The job mingw-check of your PR failed (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.
2019-07-26T04:53:33.2463364Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-26T04:53:33.2637895Z ##[command]git config gc.auto 0
2019-07-26T04:53:33.2713324Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-26T04:53:33.2769909Z ##[command]git config --get-all http.proxy
2019-07-26T04:53:33.2898534Z ##[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/63000/merge:refs/remotes/pull/63000/merge
---
2019-07-26T04:54:07.3526987Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-26T04:54:07.3527576Z 
2019-07-26T04:54:07.3528133Z   git checkout -b <new-branch-name>
2019-07-26T04:54:07.3528336Z 
2019-07-26T04:54:07.3528510Z HEAD is now at ada23c098 Merge 8b5ce839308ee6716e3b131c7cc5cc32ab00ffe8 into 18630677cf6c7ac50e6786c504b35bc09501dbe2
2019-07-26T04:54:07.3669083Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-26T04:54:07.3673918Z ==============================================================================
2019-07-26T04:54:07.3673980Z Task         : Bash
2019-07-26T04:54:07.3674046Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-26T04:59:08.9144728Z    Compiling autocfg v0.1.4
2019-07-26T04:59:10.4998067Z    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
2019-07-26T04:59:12.0668261Z    Compiling compiler_builtins v0.1.17
2019-07-26T04:59:14.6048753Z    Compiling cmake v0.1.38
2019-07-26T04:59:15.0101461Z error[E0711]: feature `rust1` is declared stable since 1.38.0, but was previously declared stable since 1.0.0
2019-07-26T04:59:15.0115520Z     |
2019-07-26T04:59:15.0121924Z 603 | #[stable(feature = "rust1", since = "1.38.0")]
2019-07-26T04:59:15.0183414Z     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-07-26T04:59:15.0183513Z 
2019-07-26T04:59:15.0183513Z 
2019-07-26T04:59:15.5201722Z error: aborting due to previous error
2019-07-26T04:59:15.5208033Z 
2019-07-26T04:59:15.6610354Z error: Could not compile `core`.
2019-07-26T04:59:15.6610667Z warning: build failed, waiting for other jobs to finish...
2019-07-26T04:59:16.8503467Z error: build failed
2019-07-26T04:59:16.8525799Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "2" "--release" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
2019-07-26T04:59:16.8536350Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2019-07-26T04:59:16.8536656Z Build completed unsuccessfully in 0:02:11
2019-07-26T04:59:16.8536656Z Build completed unsuccessfully in 0:02:11
2019-07-26T04:59:24.2011634Z ##[error]Bash exited with code '1'.
2019-07-26T04:59:24.2044883Z ##[section]Starting: Checkout
2019-07-26T04:59:24.2046490Z ==============================================================================
2019-07-26T04:59:24.2046710Z Task         : Get sources
2019-07-26T04:59:24.2046781Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 was marked as resolved.

Copy link
Contributor

commented Jul 26, 2019

Can you squash your commits please? See https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#pull-requests for some more details.

@max-sixty max-sixty force-pushed the max-sixty:chars-display branch from e745dcc to 0cb7b1c Jul 26, 2019

@max-sixty

This comment has been minimized.

Copy link
Contributor Author

commented Jul 26, 2019

@hellow554 done

@ollie27

This comment has been minimized.

Copy link
Contributor

commented Jul 26, 2019

How about using DebugList with f.debug_list().entries(self.clone()).finish()? For example it would output ['ศ', 'ไ', 'ท', 'ย', '中', '华', 'V', 'i', 'ệ', 't', ' ', 'N', 'a', 'm'] which would match other Debug impls.

@max-sixty max-sixty force-pushed the max-sixty:chars-display branch from 0cb7b1c to b27f9af Jul 26, 2019

@max-sixty

This comment has been minimized.

Copy link
Contributor Author

commented Jul 26, 2019

@ollie27 great, I didn't know about that. Changed

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jul 29, 2019

@bors: r+

Thanks @max-sixty!

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 29, 2019

📌 Commit b27f9af has been approved by alexcrichton

src/liballoc/tests/str.rs Outdated Show resolved Hide resolved
src/libcore/str/mod.rs Outdated Show resolved Hide resolved
@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 29, 2019

⌛️ Testing commit b27f9af with merge d713389...

bors added a commit that referenced this pull request Jul 29, 2019

Auto merge of #63000 - max-sixty:chars-display, r=alexcrichton
Impl Debug for Chars

Closes #62947, making `Debug` more consistent with the struct's output and purpose

Let me know any feedback!
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jul 29, 2019

Your PR failed (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.
2019-07-29T14:18:57.6623740Z ==============================================================================
2019-07-29T14:18:57.8581860Z Generating script.
2019-07-29T14:18:57.8632620Z ========================== Starting Command Output ===========================
2019-07-29T14:18:57.8688660Z [command]/bin/bash --noprofile --norc /Users/vsts/agent/2.154.3/work/_temp/884a37ae-fa12-45f4-acc8-eaf55bf1ec92.sh
2019-07-29T14:25:09.0448170Z error: RPC failed; curl 18 transfer closed with outstanding read data remaining
2019-07-29T14:25:09.0454620Z fatal: the remote end hung up unexpectedly
2019-07-29T14:25:09.0539710Z Error: Fetching /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask failed!
2019-07-29T14:25:14.3017690Z   https://github.com/Homebrew/brew#donations
2019-07-29T14:25:42.1321900Z Updated 2 taps (caskroom/versions and homebrew/core).
2019-07-29T14:25:42.1322900Z ==> New Formulae
2019-07-29T14:25:42.1323450Z asyncplusplus
---
2019-07-29T14:25:42.1458600Z ==> Deleted Formulae
2019-07-29T14:25:42.1458750Z libggz
2019-07-29T14:25:42.1458830Z libguess
2019-07-29T14:25:42.1458990Z lysp
2019-07-29T14:25:42.1791490Z ##[error]Bash exited with code '1'.
2019-07-29T14:25:42.2065650Z ##[section]Starting: Upload CPU usage statistics
2019-07-29T14:25:42.2070580Z ==============================================================================
2019-07-29T14:25:42.2070700Z Task         : Bash
2019-07-29T14:25:42.2070770Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-29T14:25:42.3926220Z Script contents:
2019-07-29T14:25:42.3927070Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-07-29T14:25:42.3952080Z ========================== Starting Command Output ===========================
2019-07-29T14:25:42.3978740Z [command]/bin/bash --noprofile --norc /Users/vsts/agent/2.154.3/work/_temp/bc555231-107f-453b-8479-d3b06170a06a.sh
2019-07-29T14:25:42.4105520Z /Users/vsts/agent/2.154.3/work/_temp/bc555231-107f-453b-8479-d3b06170a06a.sh: line 1: aws: command not found
2019-07-29T14:25:42.4190270Z ##[error]Bash exited with code '127'.
2019-07-29T14:25:42.4274930Z ##[section]Starting: Checkout
2019-07-29T14:25:42.4278010Z ==============================================================================
2019-07-29T14:25:42.4278200Z Task         : Get sources
2019-07-29T14:25:42.4278380Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 29, 2019

💔 Test failed - checks-azure

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jul 29, 2019

@bors: retry

max-sixty added some commits Jul 26, 2019

@max-sixty max-sixty force-pushed the max-sixty:chars-display branch from b27f9af to 3325ff6 Jul 29, 2019

@max-sixty

This comment has been minimized.

Copy link
Contributor Author

commented Jul 29, 2019

Thanks @lzutao, changed

@max-sixty

This comment has been minimized.

Copy link
Contributor Author

commented Jul 29, 2019

I pushed a set of rebased commits.

(Do the dictums conflicts a) "don't change old commits: new commits for new changes" and b) "rebase, don't merge" ? Maybe I'm misunderstanding them)

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jul 29, 2019

@bors: r+

Nah this is fine, thanks!

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 29, 2019

📌 Commit 3325ff6 has been approved by alexcrichton

@max-sixty

This comment has been minimized.

Copy link
Contributor Author

commented Jul 29, 2019

Cheers @alexcrichton !

@Centril Centril added this to the 1.38 milestone Jul 29, 2019

Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019

Rollup merge of rust-lang#63000 - max-sixty:chars-display, r=alexcric…
…hton

Impl Debug for Chars

Closes rust-lang#62947, making `Debug` more consistent with the struct's output and purpose

Let me know any feedback!

bors added a commit that referenced this pull request Jul 29, 2019

Auto merge of #63112 - Centril:rollup-kjgv7ak, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62507 (Remove derives `Encodable`/`Decodable` and unstabilize attribute `#[bench]`)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019

Rollup merge of rust-lang#63000 - max-sixty:chars-display, r=alexcric…
…hton

Impl Debug for Chars

Closes rust-lang#62947, making `Debug` more consistent with the struct's output and purpose

Let me know any feedback!

bors added a commit that referenced this pull request Jul 29, 2019

Auto merge of #63119 - Centril:rollup-fykplr4, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63059 (Make `#![feature(bind_by_move_pattern_guards)]` sound without `#[feature(nll)]`)
 - #63083 (Make generic parameters always use modern hygiene)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63095 (Turn `INCOMPLETE_FEATURES` into lint)
 - #63096 (Add tests for some `existential_type` ICEs)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63106 (ci: Skip installing SWIG/xz on OSX )
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jul 29, 2019

Auto merge of #63119 - Centril:rollup-fykplr4, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63059 (Make `#![feature(bind_by_move_pattern_guards)]` sound without `#[feature(nll)]`)
 - #63083 (Make generic parameters always use modern hygiene)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63095 (Turn `INCOMPLETE_FEATURES` into lint)
 - #63096 (Add tests for some `existential_type` ICEs)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63106 (ci: Skip installing SWIG/xz on OSX )
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019

Rollup merge of rust-lang#63000 - max-sixty:chars-display, r=alexcric…
…hton

Impl Debug for Chars

Closes rust-lang#62947, making `Debug` more consistent with the struct's output and purpose

Let me know any feedback!

bors added a commit that referenced this pull request Jul 30, 2019

Auto merge of #63120 - Centril:rollup-swgmy2h, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63059 (Make `#![feature(bind_by_move_pattern_guards)]` sound without `#[feature(nll)]`)
 - #63083 (Make generic parameters always use modern hygiene)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63096 (Add tests for some `existential_type` ICEs)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63106 (ci: Skip installing SWIG/xz on OSX )
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019

Rollup merge of rust-lang#63000 - max-sixty:chars-display, r=alexcric…
…hton

Impl Debug for Chars

Closes rust-lang#62947, making `Debug` more consistent with the struct's output and purpose

Let me know any feedback!

bors added a commit that referenced this pull request Jul 30, 2019

Auto merge of #63124 - Centril:rollup-onohtqt, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63083 (Make generic parameters always use modern hygiene)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63096 (Add tests for some `existential_type` ICEs)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63106 (ci: Skip installing SWIG/xz on OSX )
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)
 - #63111 (Add syntactic and semantic tests for rest patterns, i.e. `..`)

Failed merges:

r? @ghost

@bors bors merged commit 3325ff6 into rust-lang:master Jul 30, 2019

4 checks passed

pr Build #20190729.40 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details

@max-sixty max-sixty deleted the max-sixty:chars-display branch Jul 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.