about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRuud van Asseldonk <ruuda@google.com>2016-03-05 16:17:55 +0100
committerRuud van Asseldonk <ruuda@google.com>2016-03-05 16:35:57 +0100
commit0ce0cf1c87012dca1f21513566eab8b3210b029b (patch)
tree76086766759300c09405fd71933fd91baf6926e4
parent8872163b32011dd546e69d349d9c5de22cc218b8 (diff)
downloadrust-0ce0cf1c87012dca1f21513566eab8b3210b029b.tar.gz
rust-0ce0cf1c87012dca1f21513566eab8b3210b029b.zip
Update platform intrinsic generator script
The file it generates had been modified, but instead the generator
should have been modified, and the file regenerated. This merges the
modifications into the template in the generator.
-rw-r--r--src/etc/platform-intrinsics/generator.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/platform-intrinsics/generator.py b/src/etc/platform-intrinsics/generator.py
index e3aa4e688d3..0e0d4841063 100644
--- a/src/etc/platform-intrinsics/generator.py
+++ b/src/etc/platform-intrinsics/generator.py
@@ -691,7 +691,7 @@ def parse_args():
     parser.add_argument('-o', '--out', type=argparse.FileType('w'), default=sys.stdout,
                         help = 'File to output to (default stdout).')
     parser.add_argument('-i', '--info', type=argparse.FileType('r'),
-                        help = 'File containing platform specific information to merge into'
+                        help = 'File containing platform specific information to merge into '
                                 'the input files\' header.')
     parser.add_argument('in_', metavar="FILE", type=argparse.FileType('r'), nargs='+',
                         help = 'JSON files to load')
@@ -735,12 +735,12 @@ class CompilerDefs(object):
 
 use {{Intrinsic, i, i_, u, u_, f, v, v_, agg, p, void}};
 use IntrinsicDef::Named;
-use rustc::middle::ty;
+use rustc::middle::ty::TyCtxt;
 
 // The default inlining settings trigger a pathological behaviour in
 // LLVM, which causes makes compilation very slow. See #28273.
 #[inline(never)]
-pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {{
+pub fn find<'tcx>(_tcx: &TyCtxt<'tcx>, name: &str) -> Option<Intrinsic> {{
     if !name.starts_with("{0}") {{ return None }}
     Some(match &name["{0}".len()..] {{'''.format(platform.intrinsic_prefix())