Inline function to avoid naming confusion. #40266

Mark-Simulacrum · 2017-03-04T19:39:58Z

Fixes the non-RFC requiring portion of #18394. The suggestion for a new token there probably needs to either be refiled onto rust-lang/rfcs if it's still relevant (may not be given Macros 2.0 work, not sure).

rust-highfive · 2017-03-04T19:40:10Z

r? @nrc

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

petrochenkov · 2017-03-04T19:45:40Z

@bors r+ rollup

bors · 2017-03-04T19:45:41Z

📌 Commit f51d211 has been approved by petrochenkov

bors · 2017-03-04T21:29:03Z

🔒 Merge conflict

Mark-Simulacrum · 2017-03-04T22:53:46Z

Rebased, though I didn't notice a merge conflict when doing so. Did I misunderstand the message from bors? It looks different from the normal message...

Mark-Simulacrum · 2017-03-05T00:30:01Z

Oddly, I'm seeing errors in UI tests, but I can't figure out what could cause them. The code appears to be identical.

failures:

---- [ui] ui/macros/format-foreign.rs stdout ----
	ui: /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs
normalized stderr:
error: multiple unused formatting arguments
  --> $DIR/format-foreign.rs:12:5
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: argument never used
  --> $DIR/format-foreign.rs:12:40
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                                        ^^^^^^^
note: argument never used
  --> $DIR/format-foreign.rs:12:49
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                                                 ^
note: argument never used
  --> $DIR/format-foreign.rs:12:49
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                                                 ^
   = help: `%.*3$s` should be written as `{:.2$}`
   = help: `%s` should be written as `{}`
   = note: printf formatting not supported; see the documentation for `std::fmt`
   = note: this error originates in a macro outside of the current crate

error: argument never used
  --> $DIR/format-foreign.rs:13:29
   |
13 |     println!("%1$*2$.*3$f", 123.456);
   |                             ^^^^^^^
   |
   = help: `%1$*2$.*3$f` should be written as `{0:1$.2$}`
   = note: printf formatting not supported; see the documentation for `std::fmt`

error: argument never used
  --> $DIR/format-foreign.rs:17:30
   |
17 |     println!("{} %f", "one", 2.0);
   |                              ^^^

error: named argument never used
  --> $DIR/format-foreign.rs:19:39
   |
19 |     println!("Hi there, $NAME.", NAME="Tim");
   |                                       ^^^^^
   |
   = help: `$NAME` should be written as `{NAME}`
   = note: shell formatting not supported; see the documentation for `std::fmt`

error: aborting due to 4 previous errors



expected stderr:
error: multiple unused formatting arguments
  --> $DIR/format-foreign.rs:12:5
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: argument never used
  --> $DIR/format-foreign.rs:12:30
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                              ^^^^^^^^
note: argument never used
  --> $DIR/format-foreign.rs:12:40
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                                        ^^^^^^^
note: argument never used
  --> $DIR/format-foreign.rs:12:49
   |
12 |     println!("%.*3$s %s!/n", "Hello,", "World", 4);
   |                                                 ^
   = help: `%.*3$s` should be written as `{:.2$}`
   = help: `%s` should be written as `{}`
   = note: printf formatting not supported; see the documentation for `std::fmt`
   = note: this error originates in a macro outside of the current crate

error: argument never used
  --> $DIR/format-foreign.rs:13:29
   |
13 |     println!("%1$*2$.*3$f", 123.456);
   |                             ^^^^^^^
   |
   = help: `%1$*2$.*3$f` should be written as `{0:1$.2$}`
   = note: printf formatting not supported; see the documentation for `std::fmt`

error: argument never used
  --> $DIR/format-foreign.rs:17:30
   |
17 |     println!("{} %f", "one", 2.0);
   |                              ^^^

error: named argument never used
  --> $DIR/format-foreign.rs:19:39
   |
19 |     println!("Hi there, $NAME.", NAME="Tim");
   |                                       ^^^^^
   |
   = help: `$NAME` should be written as `{NAME}`
   = note: shell formatting not supported; see the documentation for `std::fmt`

error: aborting due to 4 previous errors



diff of stderr:

  7 - |  --> $DIR/format-foreign.rs:12:30|
    + |  --> $DIR/format-foreign.rs:12:40|

 10 - |   |                              ^^^^^^^^|
    + |   |                                        ^^^^^^^|

 12 - |  --> $DIR/format-foreign.rs:12:40|
    + |  --> $DIR/format-foreign.rs:12:49|

 15 - |   |                                        ^^^^^^^|
    + |   |                                                 ^|


The actual stderr differed from the expected stderr.
Actual stderr saved to /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/format-foreign.stderr
To update references, run this command from build directory:
/home/mark/Build/rust/src/test/ui/update-references.sh '/home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui' 'macros/format-foreign.rs'

error: 1 errors occurred comparing output.
status: exit code: 101
command: /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/stage2/bin/rustc /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs -L /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui --target=x86_64-unknown-linux-gnu -L /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/format-foreign.stage2-x86_64-unknown-linux-gnu.ui.libaux -C prefer-dynamic -o /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/format-foreign.stage2-x86_64-unknown-linux-gnu -Crpath -O -Lnative=/home/mark/Build/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
error: multiple unused formatting arguments
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:12:5
   |
12 |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:12:40
   |
12 |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
   |                                        ^^^^^^^
note: argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:12:49
   |
12 |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
   |                                                 ^
note: argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:12:49
   |
12 |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
   |                                                 ^
   = help: `%.*3$s` should be written as `{:.2$}`
   = help: `%s` should be written as `{}`
   = note: printf formatting not supported; see the documentation for `std::fmt`
   = note: this error originates in a macro outside of the current crate

error: argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:13:29
   |
13 |     println!("%1$*2$.*3$f", 123.456);
   |                             ^^^^^^^
   |
   = help: `%1$*2$.*3$f` should be written as `{0:1$.2$}`
   = note: printf formatting not supported; see the documentation for `std::fmt`

error: argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:17:30
   |
17 |     println!("{} %f", "one", 2.0);
   |                              ^^^

error: named argument never used
  --> /home/mark/Build/rust/src/test/ui/macros/format-foreign.rs:19:39
   |
19 |     println!("Hi there, $NAME.", NAME="Tim");
   |                                       ^^^^^
   |
   = help: `$NAME` should be written as `{NAME}`
   = note: shell formatting not supported; see the documentation for `std::fmt`

error: aborting due to 4 previous errors


------------------------------------------

thread '[ui] ui/macros/format-foreign.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:2637
note: Run with `RUST_BACKTRACE=1` for a backtrace.

---- [ui] ui/macros/macro-backtrace-println.rs stdout ----
	ui: /home/mark/Build/rust/src/test/ui/macros/macro-backtrace-println.rs
normalized stderr:
error: invalid reference to argument `0` (no arguments given)
  --> $DIR/macro-backtrace-println.rs:24:36
   |
24 |     ($fmt:expr) => (myprint!(concat!($fmt, "/n")));
   |                                    ^^^^^^^^^^^^^
...
28 |     myprintln!("{}");
   |     ----------------- in this macro invocation

error: aborting due to previous error



expected stderr:
error: invalid reference to argument `0` (no arguments given)
  --> $DIR/macro-backtrace-println.rs:24:30
   |
24 |     ($fmt:expr) => (myprint!(concat!($fmt, "/n")));
   |                              ^^^^^^^^^^^^^^^^^^^
...
28 |     myprintln!("{}");
   |     ----------------- in this macro invocation

error: aborting due to previous error



diff of stderr:

  1 - |  --> $DIR/macro-backtrace-println.rs:24:30|
    + |  --> $DIR/macro-backtrace-println.rs:24:36|

  4 - |   |                              ^^^^^^^^^^^^^^^^^^^|
    + |   |                                    ^^^^^^^^^^^^^|


The actual stderr differed from the expected stderr.
Actual stderr saved to /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/macro-backtrace-println.stderr
To update references, run this command from build directory:
/home/mark/Build/rust/src/test/ui/update-references.sh '/home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui' 'macros/macro-backtrace-println.rs'

error: 1 errors occurred comparing output.
status: exit code: 101
command: /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/stage2/bin/rustc /home/mark/Build/rust/src/test/ui/macros/macro-backtrace-println.rs -L /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui --target=x86_64-unknown-linux-gnu -L /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/macro-backtrace-println.stage2-x86_64-unknown-linux-gnu.ui.libaux -C prefer-dynamic -o /home/mark/Build/rust/build/x86_64-unknown-linux-gnu/test/ui/macros/macro-backtrace-println.stage2-x86_64-unknown-linux-gnu -Crpath -O -Lnative=/home/mark/Build/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
error: invalid reference to argument `0` (no arguments given)
  --> /home/mark/Build/rust/src/test/ui/macros/macro-backtrace-println.rs:24:36
   |
24 |     ($fmt:expr) => (myprint!(concat!($fmt, "\n")));
   |                                    ^^^^^^^^^^^^^
...
28 |     myprintln!("{}");
   |     ----------------- in this macro invocation

error: aborting due to previous error


------------------------------------------

thread '[ui] ui/macros/macro-backtrace-println.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:2637


failures:
    [ui] ui/macros/format-foreign.rs
    [ui] ui/macros/macro-backtrace-println.rs

test result: FAILED. 190 passed; 2 failed; 1 ignored; 0 measured

petrochenkov · 2017-03-05T00:36:05Z

Ha.
self.spans "before" and "after" are different (pre-bump and post-bump correspondingly).

Mark-Simulacrum · 2017-03-05T01:05:48Z

Fixed.

petrochenkov · 2017-03-05T17:48:50Z

@bors r+ rollup

bors · 2017-03-05T17:48:51Z

📌 Commit 69899b7 has been approved by petrochenkov

bors · 2017-03-05T19:53:32Z

⌛ Testing commit 69899b7 with merge 65e2a14...

Inline function to avoid naming confusion. Fixes the non-RFC requiring portion of #18394. The suggestion for a new token there probably needs to either be refiled onto rust-lang/rfcs if it's still relevant (may not be given Macros 2.0 work, not sure).

bors · 2017-03-05T22:03:04Z

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

rust-highfive assigned nrc Mar 4, 2017

Mark-Simulacrum force-pushed the cleanup-parser branch from f51d211 to 019f58b Compare March 4, 2017 22:46

Inline function to avoid naming confusion.

69899b7

Mark-Simulacrum force-pushed the cleanup-parser branch from 019f58b to 69899b7 Compare March 5, 2017 01:05

bors merged commit 69899b7 into rust-lang:master Mar 5, 2017

Mark-Simulacrum deleted the cleanup-parser branch March 25, 2017 17:26

steveklabnik mentioned this pull request Apr 11, 2017

In libsyntax, parser.bump_and_get actually does "get and then bump" (function name confusing) #18394

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Inline function to avoid naming confusion. #40266

Inline function to avoid naming confusion. #40266

Mark-Simulacrum commented Mar 4, 2017

rust-highfive commented Mar 4, 2017

petrochenkov commented Mar 4, 2017

bors commented Mar 4, 2017

bors commented Mar 4, 2017

Mark-Simulacrum commented Mar 4, 2017

Mark-Simulacrum commented Mar 5, 2017

petrochenkov commented Mar 5, 2017

Mark-Simulacrum commented Mar 5, 2017

petrochenkov commented Mar 5, 2017

bors commented Mar 5, 2017

bors commented Mar 5, 2017

bors commented Mar 5, 2017

Inline function to avoid naming confusion. #40266

Inline function to avoid naming confusion. #40266

Conversation

Mark-Simulacrum commented Mar 4, 2017

rust-highfive commented Mar 4, 2017

petrochenkov commented Mar 4, 2017

bors commented Mar 4, 2017

bors commented Mar 4, 2017

Mark-Simulacrum commented Mar 4, 2017

Mark-Simulacrum commented Mar 5, 2017

petrochenkov commented Mar 5, 2017

Mark-Simulacrum commented Mar 5, 2017

petrochenkov commented Mar 5, 2017

bors commented Mar 5, 2017

bors commented Mar 5, 2017

bors commented Mar 5, 2017