From 3d55974be4142244d98007c9557ac93e9b9b7d0d Mon Sep 17 00:00:00 2001 From: varkor Date: Fri, 5 Jan 2018 10:15:52 +0000 Subject: [PATCH] Fix quotation mark --- src/librustc_driver/driver.rs | 2 +- .../run-make/output-filename-conflicts-with-directory/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index c6b51f69406d..05bf5e5a7d94 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -136,7 +136,7 @@ pub fn compile_input(trans: Box, if let Some(dir_path) = outputs.conflicts_with_dir() { sess.err(&format!( "the generated executable for the input file \"{}\" conflicts with the \ - existing directory \"{}\'", + existing directory \"{}\"", input_path.display(), dir_path.display())); return Err(CompileIncomplete::Stopped); } diff --git a/src/test/run-make/output-filename-conflicts-with-directory/Makefile b/src/test/run-make/output-filename-conflicts-with-directory/Makefile index 68f72094ce65..74dea9ce72bf 100644 --- a/src/test/run-make/output-filename-conflicts-with-directory/Makefile +++ b/src/test/run-make/output-filename-conflicts-with-directory/Makefile @@ -4,4 +4,4 @@ all: cp foo.rs $(TMPDIR)/foo.rs mkdir $(TMPDIR)/foo $(RUSTC) $(TMPDIR)/foo.rs 2>&1 \ - | $(CGREP) -e "the generated executable for the input file \".*foo\.rs\" conflicts with the existing directory \".*foo\'" + | $(CGREP) -e "the generated executable for the input file \".*foo\.rs\" conflicts with the existing directory \".*foo\""