nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

pacify the mercilous tidy

Browse Source
This commit is contained in:
Niko Matsakis 2016-05-16 12:50:40 -04:00
parent 3ff521bdb5
commit 24cfa1efb0
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/ui/update-all-references.sh
View File

@ -1,4 +1,14 @@
#!/bin/bash #!/bin/bash
#
# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.
# A script to update the references for all tests. The idea is that # A script to update the references for all tests. The idea is that
# you do a run, which will generate files in the build directory # you do a run, which will generate files in the build directory

11
src/test/ui/update-references.sh
View File

@ -1,4 +1,14 @@
#!/bin/bash #!/bin/bash
#
# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.
# A script to update the references for particular tests. The idea is # A script to update the references for particular tests. The idea is
# that you do a run, which will generate files in the build directory # that you do a run, which will generate files in the build directory
@ -30,7 +40,6 @@ while [[ "$1" != "" ]]; do
echo updating $MYDIR/$STDOUT_NAME echo updating $MYDIR/$STDOUT_NAME
cp $BUILD_DIR/$STDOUT_NAME $MYDIR/$STDOUT_NAME cp $BUILD_DIR/$STDOUT_NAME $MYDIR/$STDOUT_NAME
fi fi
if [ -f $BUILD_DIR/$STDERR_NAME ] && \ if [ -f $BUILD_DIR/$STDERR_NAME ] && \
! (diff $BUILD_DIR/$STDERR_NAME $MYDIR/$STDERR_NAME > /dev/null); then ! (diff $BUILD_DIR/$STDERR_NAME $MYDIR/$STDERR_NAME > /dev/null); then
echo updating $MYDIR/$STDERR_NAME echo updating $MYDIR/$STDERR_NAME

3
src/tools/compiletest/src/runtest.rs
View File

@ -2159,7 +2159,8 @@ actual:\n\
match File::open(path).and_then(|mut f| f.read_to_string(&mut result)) { match File::open(path).and_then(|mut f| f.read_to_string(&mut result)) {
Ok(_) => result, Ok(_) => result,
Err(e) => { Err(e) => {
self.fatal(&format!("failed to load expected output from `{}`: {}", path.display(), e)) self.fatal(&format!("failed to load expected output from `{}`: {}",
path.display(), e))
} }
} }
} }