Skip to content

Rollup of 7 pull requests #68752

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

Merged
merged 18 commits into from
Feb 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3c91bdc
Suggest path separator for single-colon typos
bobrippling Jan 29, 2020
2a79ed0
[docs] remind bug reporters to update nightly
jbr Jan 31, 2020
08e85aa
Ignore `build` dir formatting
jonas-schievink Jan 31, 2020
482c761
Use BufWriter
sinkuu Jan 22, 2020
cad0cfd
Remove a comment about pretty printer in formatting tests
LunaBorowska Feb 1, 2020
8bbaeb7
Remove `Alloc` in favor of `AllocRef`
TimDiekmann Feb 1, 2020
88d64a0
Simplify span usage and avoid .eat()
bobrippling Feb 1, 2020
45fb723
Move colon-check to recover_colon_before_qpath_proj()
bobrippling Feb 1, 2020
991d2ee
Improve wording and docs for qualified path recovery
bobrippling Feb 1, 2020
07ee472
Avoid qualified path recovery when not followed by identifier
bobrippling Feb 1, 2020
726568b
Do not suggest things named underscore
JohnTitor Feb 1, 2020
bf68a05
Rollup merge of #68460 - sinkuu:emit_mir_buffered, r=Mark-Simulacrum
JohnTitor Feb 1, 2020
b18b269
Rollup merge of #68681 - bobrippling:fix-matched-angle-brackets, r=Ce…
JohnTitor Feb 1, 2020
518ed67
Rollup merge of #68688 - jbr:remind-bug-reporters-to-update-if-on-nig…
JohnTitor Feb 1, 2020
44dc4c2
Rollup merge of #68704 - jonas-schievink:ignore-build-fmt, r=Mark-Sim…
JohnTitor Feb 1, 2020
1529126
Rollup merge of #68727 - xfix:remove-comment-about-pretty-printer-in-…
JohnTitor Feb 1, 2020
c7332ab
Rollup merge of #68736 - TimDiekmann:remove-alloc, r=Amanieu
JohnTitor Feb 1, 2020
87bb0c4
Rollup merge of #68740 - JohnTitor:do-not-sugg-underscore, r=Centril
JohnTitor Feb 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove a comment about pretty printer in formatting tests
rustc is now using rustfmt, not the old formatter.
  • Loading branch information
LunaBorowska committed Feb 1, 2020
commit cad0cfd9fdbc64dece3f38c03b15ed9aad032d5c
6 changes: 0 additions & 6 deletions src/test/ui/ifmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ pub fn main() {
let a: &dyn fmt::Debug = &1;
t!(format!("{:?}", a), "1");


// Formatting strings and their arguments
t!(format!("{}", "a"), "a");
t!(format!("{:4}", "a"), "a ");
Expand Down Expand Up @@ -187,10 +186,6 @@ pub fn main() {
// Ergonomic format_args!
t!(format!("{0:x} {0:X}", 15), "f F");
t!(format!("{0:x} {0:X} {}", 15), "f F 15");
// NOTE: For now the longer test cases must not be followed immediately by
// >1 empty lines, or the pretty printer will break. Since no one wants to
// touch the current pretty printer (#751), we have no choice but to work
// around it. Some of the following test cases are also affected.
t!(format!("{:x}{0:X}{a:x}{:X}{1:x}{a:X}", 13, 14, a=15), "dDfEeF");
t!(format!("{a:x} {a:X}", a=15), "f F");

Expand All @@ -201,7 +196,6 @@ pub fn main() {
t!(format!("{a:.*} {0} {:.*}", 4, 3, "efgh", a="abcdef"), "abcd 4 efg");
t!(format!("{:.a$} {a} {a:#x}", "aaaaaa", a=2), "aa 2 0x2");


// Test that pointers don't get truncated.
{
let val = usize::MAX;
Expand Down