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

Remove `ObsoleteInPlace` #60803

Merged
merged 2 commits into from May 24, 2019

Conversation

Projects
None yet
9 participants
@varkor
Copy link
Member

commented May 13, 2019

The in place syntax has been deprecated for over a year. As it is, this is accumulated cruft: the error messages are unlikely to be helpful any more and it conflicts with some useful syntax (e.g. const generics in some instances).

It may be that removing Token::LArrow is backwards-incompatible. We should do a crater run to check.

cc @eddyb

@varkor

This comment has been minimized.

Copy link
Member Author

commented May 13, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

⌛️ Trying commit 036e368 with merge 584c7be...

bors added a commit that referenced this pull request May 13, 2019

Auto merge of #60803 - varkor:remove-in-place-syntax, r=<try>
Remove `ObsoleteInPlace` and `LArrow`

The in place syntax has been deprecated for over a year. As it is, this is accumulated cruft: the error messages are unlikely to be helpful any more and it conflicts with some useful syntax (e.g. const generics in some instances).

It may be that removing `Token::LArrow` is backwards-incompatible. We should do a crater run to check.

cc @eddyb
@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented May 13, 2019

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:033d58f4:start=1557783046805175899,finish=1557783047634645751,duration=829469852
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:48] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:49] tidy error: /checkout/src/test/ui/obsolete-in-place/bad.rs: missing trailing newline
[00:04:54] some tidy checks failed
[00:04:54] 
[00:04:54] 
[00:04:54] 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:54] 
[00:04:54] 
[00:04:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:54] Build completed unsuccessfully in 0:01:13
[00:04:54] Build completed unsuccessfully in 0:01:13
[00:04:54] Makefile:67: recipe for target 'tidy' failed
[00:04:54] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0a40aafa
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Mon May 13 21:35:53 UTC 2019
---
travis_time:end:01792181:start=1557783354180111421,finish=1557783354184736175,duration=4624754
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1aa98091
$ 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:0c876f36
travis_time:start:0c876f36
$ 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:1525c15e
$ 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 force-pushed the varkor:remove-in-place-syntax branch from 036e368 to 1642e7c May 13, 2019

@petrochenkov petrochenkov self-assigned this May 13, 2019

fn main() {
let x = -5;
if x<-1 {
//~^ ERROR emplacement syntax is obsolete
if x<-1 { // ok: parses as a comparison

This comment has been minimized.

Copy link
@Centril

Centril May 13, 2019

Member

So I think it's good that we remove it from the AST and such, but keeping options open re. <- and not introducing new stable behavior would be good so let's reject this in the parser?

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

Removing ObsoleteInPlace is a great idea since the deprecation was long enough and it's very unlikely to be used under cfg(FALSE) anymore.
I'm skeptical a removing the <- token though, it's there for future-proofing at least (it existed with this purpose even before emplacement was actually implemented).

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

Let's see what crater finds anyway.

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 13, 2019

@varkor

This comment was marked as outdated.

Copy link
Member Author

commented May 14, 2019

@craterbot run start=master#a9ec99f4201ec33026a468ef1289f98a95b4d71a end=try#584c7be35a83284d36d58cad4c58cc3e41ad5f04 mode=check-only

@craterbot

This comment was marked as outdated.

Copy link
Collaborator

commented May 14, 2019

👌 Experiment pr-60803 created and queued.
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot

This comment was marked as outdated.

Copy link
Collaborator

commented May 14, 2019

🚧 Experiment pr-60803 is now running on agent aws-3-tmp.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@pietroalbini

This comment was marked as outdated.

Copy link
Member

commented May 14, 2019

Oh... uh... by the way Crater is broken for try builds...

@craterbot

This comment was marked as outdated.

Copy link
Collaborator

commented May 14, 2019

🎉 Experiment pr-60803 is completed!
📊 0 regressed and 0 fixed (60951 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@petrochenkov

This comment was marked as outdated.

Copy link
Contributor

commented May 15, 2019

Nothing to 🎉, "0 regressed" is because crater is broken.
Marking as waiting on crater until it's fixed, since this does need a crater run.

@bors

This comment was marked as outdated.

Copy link
Contributor

commented May 17, 2019

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

@yodaldevoid

This comment was marked as outdated.

Copy link
Contributor

commented May 18, 2019

With #60874 crater has been fixed, so this should be queued up for a new crater run.

@pietroalbini

This comment was marked as outdated.

Copy link
Member

commented May 18, 2019

@bors retry try

@bors

This comment was marked as outdated.

Copy link
Contributor

commented May 18, 2019

🔒 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:

  1. git checkout remove-in-place-syntax (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self remove-in-place-syntax --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
Removing src/test/ui/placement-syntax.stderr
Auto-merging src/libsyntax/print/pprust.rs
Auto-merging src/libsyntax/parse/parser.rs
CONFLICT (content): Merge conflict in src/libsyntax/parse/parser.rs
Auto-merging src/libsyntax/parse/lexer/mod.rs
Auto-merging src/libsyntax/feature_gate.rs
Auto-merging src/librustc/hir/lowering.rs
Automatic merge failed; fix conflicts and then commit the result.

@pietroalbini pietroalbini reopened this May 18, 2019

@varkor varkor force-pushed the varkor:remove-in-place-syntax branch from 1642e7c to 09fbf38 May 18, 2019

@Centril

This comment has been minimized.

Copy link
Member

commented May 22, 2019

Regression in rsc-1.2.0 appears to be spurious.

@Centril

This comment has been minimized.

Copy link
Member

commented May 22, 2019

@varkor Can you scale back the PR to not remove <- as a token? Per the crater results we should otherwise be good to go.

@varkor varkor force-pushed the varkor:remove-in-place-syntax branch from 09fbf38 to 17e40f5 May 22, 2019

@varkor varkor changed the title Remove `ObsoleteInPlace` and `LArrow` Remove `ObsoleteInPlace` May 22, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 22, 2019

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:0551a5ea:start=1558563413946988738,finish=1558563501872335169,duration=87925346431
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:11:31] .................................................................................................... 300/5572
[01:11:34] .................................................................................................... 400/5572
[01:11:38] ................................................................................................i... 500/5572
[01:11:41] .................................................................................................... 600/5572
[01:11:45] ...................................................................F................................ 700/5572
[01:11:55] .............................................................................i...............i...... 900/5572
[01:11:59] .................................................................................................... 1000/5572
[01:12:03] ..........iiiii..................................................................................... 1100/5572
[01:12:06] .................................................................................................... 1200/5572
---
[01:13:30] ..................................................................................ii...i...ii....... 3500/5572
[01:13:34] .................................................................................................... 3600/5572
[01:13:37] .................................................................................................... 3700/5572
[01:13:41] .......................................................................................ii........... 3800/5572
[01:13:44] ................................F................................................................... 3900/5572
[01:13:48] .......................................................................i............................ 4100/5572
[01:13:51] .................................................................................................... 4200/5572
[01:13:51] .................................................................................................... 4200/5572
[01:13:58] ........F........................................................................................... 4300/5572
[01:14:09] .................................................................................................... 4500/5572
[01:14:12] .................................................................................................... 4600/5572
[01:14:17] .................................................................................................... 4700/5572
[01:14:25] .................................................................................................... 4800/5572
---
[01:14:54] 
[01:14:54] + error: expected type, found `1`
[01:14:54] +   --> $DIR/const-expression-parameter.rs:9:21
[01:14:54] +    |
[01:14:54] + LL |     i32_identity::<-1>(); // ok
[01:14:54] + 
[01:14:54] + 
[01:14:54] 1 error: expected one of `,` or `>`, found `+`
[01:14:54] 3    |
[01:14:54] 
[01:14:54] 10 LL | #![feature(const_generics)]
[01:14:54] 11    |            ^^^^^^^^^^^^^^
---
[01:14:54] 
[01:14:54] 
[01:14:54] The actual stderr differed from the expected stderr.
[01:14:54] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/const-expression-parameter/const-expression-parameter.stderr
[01:14:54] To update references, rerun the tests and pass the `--bless` flag
[01:14:54] To only update this specific test, also pass `--test-args const-generics/const-expression-parameter.rs`
[01:14:54] error: 1 errors occurred comparing output.
[01:14:54] status: exit code: 1
[01:14:54] status: exit code: 1
[01:14:54] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/const-expression-parameter.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/const-expression-parameter" "-Crpath" "-O" "-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/const-generics/const-expression-parameter/auxiliary" "-A" "unused"
[01:14:54] ------------------------------------------
[01:14:54] 
[01:14:54] ------------------------------------------
[01:14:54] stderr:
[01:14:54] stderr:
[01:14:54] ------------------------------------------
[01:14:54] error: expected type, found `1`
[01:14:54]   --> /checkout/src/test/ui/const-generics/const-expression-parameter.rs:9:21
[01:14:54]    |
[01:14:54] LL |     i32_identity::<-1>(); // ok
[01:14:54] 
[01:14:54] 
[01:14:54] error: expected one of `,` or `>`, found `+`
[01:14:54]    |
[01:14:54]    |
[01:14:54] LL |     i32_identity::<1 + 2>(); //~ ERROR expected one of `,` or `>`, found `+`
[01:14:54]    |                      ^ expected one of `,` or `>` here
[01:14:54] warning: the feature `const_generics` is incomplete and may cause the compiler to crash
[01:14:54]   --> /checkout/src/test/ui/const-generics/const-expression-parameter.rs:1:12
[01:14:54]    |
[01:14:54] LL | #![feature(const_generics)]
---
[01:14:54] diff of stderr:
[01:14:54] 
[01:14:54] - error: expected expression, found keyword `in`
[01:14:54] -   --> $DIR/bad.rs:6:5
[01:14:54] + error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `<-`
[01:14:54] 3    |
[01:14:54] 3    |
[01:14:54] - LL |     in(foo) { bar };
[01:14:54] -    |     ^^ expected expression
[01:14:54] + LL |     x <- y; // ok: parses as a comparison
[01:14:54] +    |       ^^ expected one of 8 possible tokens here
[01:14:54] - error: aborting due to previous error
[01:14:54] + error[E0308]: mismatched types
[01:14:54] +   --> $DIR/bad.rs:5:5
[01:14:54] +    |
[01:14:54] +    |
[01:14:54] + LL | fn main() {
[01:14:54] +    |           - expected `()` because of default return type
[01:14:54] + LL |     let (x, y, foo, bar) = (0, 0, 0, 0);
[01:14:54] + LL |     x <- y; // ok: parses as a comparison
[01:14:54] +    |     ^ expected (), found integer
[01:14:54] +    = note: expected type `()`
[01:14:54] +               found type `{integer}`
[01:14:54] 8 
[01:14:54] + error: aborting due to 2 previous errors
[01:14:54] + error: aborting due to 2 previous errors
[01:14:54] + 
[01:14:54] + For more information about this error, try `rustc --explain E0308`.
[01:14:54] 9 
[01:14:54] 
[01:14:54] 
[01:14:54] The actual stderr differed from the expected stderr.
[01:14:54] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/obsolete-in-place/bad/bad.stderr
[01:14:54] To update references, rerun the tests and pass the `--bless` flag
[01:14:54] To only update this specific test, also pass `--test-args obsolete-in-place/bad.rs`
[01:14:54] error: 1 errors occurred comparing output.
[01:14:54] status: exit code: 1
[01:14:54] status: exit code: 1
[01:14:54] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/obsolete-in-place/bad.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/obsolete-in-place/bad" "-Crpath" "-O" "-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/obsolete-in-place/bad/auxiliary" "-A" "unused"
[01:14:54] ------------------------------------------
[01:14:54] 
[01:14:54] ------------------------------------------
[01:14:54] stderr:
[01:14:54] stderr:
[01:14:54] ------------------------------------------
[01:14:54] error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `<-`
[01:14:54]   --> /checkout/src/test/ui/obsolete-in-place/bad.rs:5:7
[01:14:54]    |
[01:14:54] LL |     x <- y; // ok: parses as a comparison
[01:14:54]    |       ^^ expected one of 8 possible tokens here
[01:14:54] error[E0308]: mismatched types
[01:14:54]   --> /checkout/src/test/ui/obsolete-in-place/bad.rs:5:5
[01:14:54]    |
[01:14:54] LL | fn main() {
[01:14:54] LL | fn main() {
[01:14:54]    |           - expected `()` because of default return type
[01:14:54] LL |     let (x, y, foo, bar) = (0, 0, 0, 0);
[01:14:54] LL |     x <- y; // ok: parses as a comparison
[01:14:54]    |     ^ expected (), found integer
[01:14:54]    = note: expected type `()`
[01:14:54]               found type `{integer}`
[01:14:54] 
[01:14:54] error: aborting due to 2 previous errors
---
[01:14:54] 
[01:14:54] 
[01:14:54] ---- [ui] ui/placement-syntax.rs stdout ----
[01:14:54] 
[01:14:54] error: test compilation failed although it shouldn't!
[01:14:54] status: exit code: 1
[01:14:54] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/placement-syntax.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/placement-syntax/a" "-Crpath" "-O" "-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/placement-syntax/auxiliary" "-A" "unused"
[01:14:54] ------------------------------------------
[01:14:54] 
[01:14:54] ------------------------------------------
[01:14:54] stderr:
[01:14:54] stderr:
[01:14:54] ------------------------------------------
[01:14:54] error: expected `{`, found `<-`
[01:14:54]    |
[01:14:54]    |
[01:14:54] LL |     if x<-1 { // ok: parses as a comparison
[01:14:54]    |     --  ^^ expected `{`
[01:14:54]    |     |
[01:14:54]    |     this `if` statement has a condition, but no block
[01:14:54] error: aborting due to previous error
[01:14:54] 
[01:14:54] 
[01:14:54] ------------------------------------------
---
[01:14:54] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:512:22
[01:14:54] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:14:54] 
[01:14:54] 
[01:14:54] 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-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:14:54] 
[01:14:54] 
[01:14:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:14:54] Build completed unsuccessfully in 0:04:51
[01:14:54] Build completed unsuccessfully in 0:04:51
[01:14:54] Makefile:48: recipe for target 'check' failed
[01:14:54] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:20a5514c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed May 22 23:33:25 UTC 2019

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 May 23, 2019

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

@varkor varkor force-pushed the varkor:remove-in-place-syntax branch 2 times, most recently from 095877a to 36f6542 May 23, 2019

@varkor

This comment has been minimized.

Copy link
Member Author

commented May 24, 2019

Removed the <- token removal.

@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

📌 Commit 36f6542 has been approved by petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

⌛️ Testing commit 36f6542 with merge d96c01e...

bors added a commit that referenced this pull request May 24, 2019

Auto merge of #60803 - varkor:remove-in-place-syntax, r=petrochenkov
Remove `ObsoleteInPlace`

The in place syntax has been deprecated for over a year. As it is, this is accumulated cruft: the error messages are unlikely to be helpful any more and it conflicts with some useful syntax (e.g. const generics in some instances).

It may be that removing `Token::LArrow` is backwards-incompatible. We should do a crater run to check.

cc @eddyb
@bors

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

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

@bors bors added the merged-by-bors label May 24, 2019

@bors bors merged commit 36f6542 into rust-lang:master May 24, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request May 24, 2019

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 24, 2019

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 25, 2019

submodules: update clippy from a8eeb7cd to 577ee796
Changes:
````
Rustup to rust-lang#61026
rustup rust-lang#60803
Rustup to rust-lang#59545
Rustup to rust-lang#60965
clippy: bump rustc_tools util version to 0.2 rustc_tools_util: fix typo in docs (readme)
rustc_tool_utils: bump version to 0.2.0
update if_chain to 1.0.0
tests: update needless_bool test stderr
cargo fmt
Rustup to rust-lang#60740
Lifetimes UI test cleanup
````

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 25, 2019

submodules: update clippy from a8eeb7cd to 577ee796
Changes:
````
Rustup to rust-lang#61026
rustup rust-lang#60803
Rustup to rust-lang#59545
Rustup to rust-lang#60965
clippy: bump rustc_tools util version to 0.2 rustc_tools_util: fix typo in docs (readme)
rustc_tool_utils: bump version to 0.2.0
update if_chain to 1.0.0
tests: update needless_bool test stderr
cargo fmt
Rustup to rust-lang#60740
Lifetimes UI test cleanup
````

bors added a commit that referenced this pull request May 25, 2019

Auto merge of #61176 - matthiaskrgr:submodule_upd, r=oli-obk
submodules: update clippy from a8eeb7cd to 577ee796

Changes:
````
Rustup to #61026
rustup #60803
Rustup to #59545
Rustup to #60965
clippy: bump rustc_tools util version to 0.2 rustc_tools_util: fix typo in docs (readme)
rustc_tool_utils: bump version to 0.2.0
update if_chain to 1.0.0
tests: update needless_bool test stderr
cargo fmt
Rustup to #60740
Lifetimes UI test cleanup
````
r? @oli-obk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.