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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix typos found by codespell. #53496

Merged
merged 1 commit into from
Aug 21, 2018
Merged

Fix typos found by codespell. #53496

merged 1 commit into from
Aug 21, 2018

Conversation

matthiaskrgr
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2018
@rust-highfive
Copy link
Collaborator

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

Click to expand the log. 
[00:01:59] Successfully tagged rust-ci:latest
[00:01:59] Built container sha256:6f7d872ce5e67b0bcd6ed114d4bf31d383daadb7417388c0d70966805b9cd8ff
[00:01:59] Uploading finished image to s3://rust-lang-ci-sccache2/docker/3fac661d52d4c71ac16bc8a580645b8477f900bb38ec96582412bcffa9d55c97d34b20dca6548234f73ee650dcc2ed336a3cebba51a609d3ed1a29ba737d52be
[00:01:59] 
[00:01:59] Partial credentials found in env, missing: AWS_SECRET_ACCESS_KEY
[00:02:06] xargs: docker: terminated by signal 13

[00:02:06] travis_time:end:03b4ebe0:start=1534689352554980893,finish=1534689422704258072,duration=70149277179
[CI_JOB_NAME=x86_64-gnu-llvm-5.0]
[00:02:07] [CI_JOB_NAME=x86_64-gnu-llvm-5.0]
---

[00:04:57] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:57] tidy error: /checkout/src/librustc_mir/borrow_check/nll/invalidation.rs:544: TODO is deprecated; use FIXME
[00:04:57] tidy error: /checkout/src/libsyntax/parse/parser.rs:3538: line longer than 100 chars
[00:04:58] some tidy checks failed
[00:04:58] 
[00:04:58] 
[00:04:58] command did not execute successfully: "/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" "--quiet"
[00:04:58] 
[00:04:58] 
[00:04:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:58] Build completed unsuccessfully in 0:00:52
[00:04:58] Build completed unsuccessfully in 0:00:52
[00:04:58] Makefile:79: recipe for target 'tidy' failed
[00:04:58] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:05d6daef
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:12e71f50:start=1534689595455853458,finish=1534689595462513810,duration=6660352
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1f54256c
$ 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 -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:1bff2cd8
travis_time:start:1bff2cd8
$ 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:0733c494
$ 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)

varkor
varkor reviewed Aug 19, 2018
View reviewed changes
Copy link
Member

@varkor varkor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you squash the commits? Once the couple of comments have been addressed, I'll approve, thanks!

src/ci/docker/scripts/musl.sh Outdated
@@ -32,7 +32,7 @@ shift

export CFLAGS="-fPIC $CFLAGS"

# FIXME: remove the patch when upate to 1.1.20
# FIXME: remove the patch when update to 1.1.20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"when updating to 1.1.20" sounds better.

src/librustc/hir/map/definitions.rs Outdated
@@ -9,7 +9,7 @@
// except according to those terms.

//! For each definition, we track the following data. A definition
//! here is defined somewhat circularly as "something with a def-id",
//! here is defined somewhat circular as "something with a def-id",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was correct before.

src/librustc_mir/dataflow/mod.rs Outdated
@@ -605,7 +605,7 @@ pub trait BitDenotation: BitwiseOperator {
/// `sets.on_entry` to that local clone into `statement_effect` and
/// `terminator_effect`).
///
/// When its false, no local clone is constucted; instead a
/// When its false, no local clone is constructed; instead a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be "it's".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all done, thanks

@varkor
Copy link
Member

varkor commented Aug 19, 2018

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 19, 2018

📌 Commit 71120ef has been approved by varkor

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 19, 2018
@kennytm kennytm mentioned this pull request Aug 20, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Aug 21, 2018
@kennytm
Rollup merge of rust-lang#53496 - matthiaskrgr:codespell_08_2018, r=v…
b5519db 
…arkor

Fix typos found by codespell.
bors added a commit that referenced this pull request Aug 21, 2018
@bors
Auto merge of #53530 - kennytm:rollup, r=kennytm
9f9f2c0 
Rollup of 17 pull requests

Successful merges:

 - #53030 (Updated RELEASES.md for 1.29.0)
 - #53104 (expand the documentation on the `Unpin` trait)
 - #53213 (Stabilize IP associated constants)
 - #53296 (When closure with no arguments was expected, suggest wrapping)
 - #53329 (Replace usages of ptr::offset with ptr::{add,sub}.)
 - #53363 (add individual docs to `core::num::NonZero*`)
 - #53370 (Stabilize macro_vis_matcher)
 - #53393 (Mark libserialize functions as inline)
 - #53405 (restore the page title after escaping out of a search)
 - #53452 (Change target triple used to check for lldb in build-manifest)
 - #53462 (Document Box::into_raw returns non-null ptr)
 - #53465 (Remove LinkMeta struct)
 - #53492 (update lld submodule to include RISCV patch)
 - #53496 (Fix typos found by codespell.)
 - #53521 (syntax: Optimize some literal parsing)
 - #53540 (Moved issue-53157.rs into src/test/ui/consts/const-eval/)
 - #53551 (Avoid some Place clones.)

Failed merges:

r? @ghost
@bors bors merged commit 71120ef into rust-lang:master Aug 21, 2018
@matthiaskrgr matthiaskrgr deleted the codespell_08_2018 branch August 22, 2018 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varkor varkor varkor left review comments

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@matthiaskrgr @rust-highfive @varkor @bors @pnkfelix